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

reorganize some files and imports

Browse source
This commit is contained in:
Joey Hess 2014-01-26 16:25:55 -04:00
parent 3149a62a35
commit 86ffeb73d1
34 changed files with 92 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Command/Sync.hs
View file

@ -27,7 +27,6 @@ import qualified Git
import Git.Types (BlobType(..))
import qualified Types.Remote
import qualified Remote.Git
import qualified Option
import Types.Key
import Config
import Annex.ReplaceFile
@ -53,7 +52,7 @@ syncOptions :: [Option]
syncOptions = [ contentOption ]
contentOption :: Option
contentOption = Option.flag [] "content" "also transfer file contents"
contentOption = flagOption [] "content" "also transfer file contents"
seek :: CommandSeek
seek rs = do
@ -85,7 +84,7 @@ seek rs = do
, map (withbranch . pullRemote) gitremotes
, [ mergeAnnex ]
]
whenM (Annex.getFlag $ Option.name contentOption) $
whenM (Annex.getFlag $ optionName contentOption) $
seekSyncContent remotes
seekActions $ return $ concat
[ [ withbranch pushLocal ]