mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync: Show a nicer message if a user tries to sync to a special remote.

Browse source
This commit is contained in:
Joey Hess 2012-05-27 20:55:56 -04:00
parent f120dbc735
commit 6e213d04f1
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Command/Sync.hs
View file

@ -57,10 +57,17 @@ syncRemotes rs = ifM (Annex.getState Annex.fast) ( nub <$> pickfast , wanted )
wanted wanted
| null rs = good =<< concat . byspeed <$> available | null rs = good =<< concat . byspeed <$> available
| otherwise = listed | otherwise = listed
listed = catMaybes <$> mapM (Remote.byName . Just) rs listed = do
l <- catMaybes <$> mapM (Remote.byName . Just) rs
let s = filter special l
unless (null s) $
error $ "cannot sync special remotes: " ++
unwords (map Types.Remote.name s)
return l
available = filter nonspecial <$> Remote.enabledRemoteList available = filter nonspecial <$> Remote.enabledRemoteList
good = filterM $ Remote.Git.repoAvail . Types.Remote.repo good = filterM $ Remote.Git.repoAvail . Types.Remote.repo
nonspecial r = Types.Remote.remotetype r == Remote.Git.remote nonspecial r = Types.Remote.remotetype r == Remote.Git.remote
special = not . nonspecial
fastest = fromMaybe [] . headMaybe . byspeed fastest = fromMaybe [] . headMaybe . byspeed
byspeed = map snd . sort . M.toList . costmap byspeed = map snd . sort . M.toList . costmap
costmap = M.fromListWith (++) . map costpair costmap = M.fromListWith (++) . map costpair

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
git-annex (3.20120523) UNRELEASED; urgency=low
* sync: Show a nicer message if a user tries to sync to a special remote.
-- Joey Hess <joeyh@debian.org> Sun, 27 May 2012 20:55:29 -0400
git-annex (3.20120522) unstable; urgency=low git-annex (3.20120522) unstable; urgency=low
* Pass -a to cp even when it supports --reflink=auto, to preserve * Pass -a to cp even when it supports --reflink=auto, to preserve