Simplified repository description line format. The remote name, if any, is always in square brackets after the description.

This commit is contained in:
Joey Hess 2014-04-26 21:28:49 -03:00
parent 72ec0ab736
commit f80f0e12fe
4 changed files with 8 additions and 5 deletions

View file

@ -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.) -}

2
debian/changelog vendored
View file

@ -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 <joeyh@debian.org> Wed, 23 Apr 2014 12:43:39 -0400

View file

@ -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]]

View file

@ -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