From f80f0e12fe546d5bd7bd83df2beadd31488c711a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 26 Apr 2014 21:28:49 -0300 Subject: [PATCH] Simplified repository description line format. The remote name, if any, is always in square brackets after the description. --- Remote.hs | 5 ++--- debian/changelog | 2 ++ doc/bugs/git_annex_info_listings_can_be_confusing.mdwn | 2 ++ doc/walkthrough/automatically_managing_content.mdwn | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Remote.hs b/Remote.hs index da33e195e5..06c147506e 100644 --- a/Remote.hs +++ b/Remote.hs @@ -87,9 +87,8 @@ uuidDescriptions = M.unionWith addName <$> uuidMap <*> remoteMap name addName :: String -> RemoteName -> String addName desc n - | desc == n = desc - | null desc = n - | otherwise = n ++ " (" ++ desc ++ ")" + | desc == n || null desc = "[" ++ n ++ "]" + | otherwise = desc ++ " [" ++ n ++ "]" {- When a name is specified, looks up the remote matching that name. - (Or it can be a UUID.) -} diff --git a/debian/changelog b/debian/changelog index 176178be0b..449d255d07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ git-annex (5.20140422) UNRELEASED; urgency=medium * Standalone builds now check gpg signatures before upgrading. + * Simplified repository description line format. The remote name, + if any, is always in square brackets after the description. -- Joey Hess Wed, 23 Apr 2014 12:43:39 -0400 diff --git a/doc/bugs/git_annex_info_listings_can_be_confusing.mdwn b/doc/bugs/git_annex_info_listings_can_be_confusing.mdwn index b3fda5edf6..aaf2a95606 100644 --- a/doc/bugs/git_annex_info_listings_can_be_confusing.mdwn +++ b/doc/bugs/git_annex_info_listings_can_be_confusing.mdwn @@ -29,3 +29,5 @@ Here we see the description surrounded in brackets and also not in brackets. Th # End of transcript or log. """]] + +[[done]] --[[Joey]] diff --git a/doc/walkthrough/automatically_managing_content.mdwn b/doc/walkthrough/automatically_managing_content.mdwn index 0080ebcb5e..ec55c1cc8b 100644 --- a/doc/walkthrough/automatically_managing_content.mdwn +++ b/doc/walkthrough/automatically_managing_content.mdwn @@ -13,7 +13,7 @@ file. 0c443de8-e644-11df-acbf-f7cd7ca6210d -- laptop whereis other_file (3 copies) 0c443de8-e644-11df-acbf-f7cd7ca6210d -- laptop - 62b39bbe-4149-11e0-af01-bb89245a1e61 -- here (usb drive) + 62b39bbe-4149-11e0-af01-bb89245a1e61 -- usb drive [here] 7570b02e-15e9-11e0-adf0-9f3f94cb2eaa -- backup drive What would be handy is some automated versions of get and drop, that only @@ -31,7 +31,7 @@ work toward having two copies of your files. # git annex whereis whereis my_cool_big_file (2 copies) 0c443de8-e644-11df-acbf-f7cd7ca6210d -- laptop - 62b39bbe-4149-11e0-af01-bb89245a1e61 -- here (usb drive) + 62b39bbe-4149-11e0-af01-bb89245a1e61 -- usb drive [here] whereis other_file (2 copies) 0c443de8-e644-11df-acbf-f7cd7ca6210d -- laptop 7570b02e-15e9-11e0-adf0-9f3f94cb2eaa -- backup drive