summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-09-23 18:04:38 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-09-23 18:04:38 -0400
commitd75da353b9905bb5757df08520e63607fbfd2073 (patch)
tree5f1205e4254ad2a1ca815dcc5393cfa10e3d1c83 /Command
parent6dc23b889e01d56a7aff241f9b7e347dd55cfc47 (diff)
documentation/warning message update for future feature
Diffstat (limited to 'Command')
-rw-r--r--Command/Unused.hs24
1 files changed, 9 insertions, 15 deletions
diff --git a/Command/Unused.hs b/Command/Unused.hs
index 535b9b33e..803debef8 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -112,21 +112,8 @@ staleBadMsg t = unlines $
unusedMsg :: [(Int, Key)] -> String
unusedMsg u = unusedMsg' u
- ["Some annexed data is no longer used by any files in the current branch:"]
- [dropMsg Nothing,
- "Please be cautious -- are you sure that another branch, or another",
- "repository does not still use this data?"]
-
-remoteUnusedMsg :: Remote.Remote Annex -> [(Int, Key)] -> String
-remoteUnusedMsg r u = unusedMsg' u
- ["Some annexed data on " ++ name ++
- " is not used by any files in the current branch:"]
- [dropMsg $ Just r,
- "Please be cautious -- Are you sure that the remote repository",
- "does not use this data? Or that it's not used by another branch?"]
- where
- name = Remote.name r
-
+ ["Some annexed data is no longer used by any files:"]
+ [dropMsg Nothing]
unusedMsg' :: [(Int, Key)] -> [String] -> [String] -> String
unusedMsg' u header trailer = unlines $
header ++
@@ -134,6 +121,13 @@ unusedMsg' u header trailer = unlines $
["(To see where data was previously used, try: git log --stat -S'KEY')"] ++
trailer
+remoteUnusedMsg :: Remote.Remote Annex -> [(Int, Key)] -> String
+remoteUnusedMsg r u = unusedMsg' u
+ ["Some annexed data on " ++ name ++ " is not used by any files:"]
+ [dropMsg $ Just r]
+ where
+ name = Remote.name r
+
dropMsg :: Maybe (Remote.Remote Annex) -> String
dropMsg Nothing = dropMsg' ""
dropMsg (Just r) = dropMsg' $ " --from " ++ Remote.name r