summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-31 02:18:16 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-31 02:18:16 -0400
commit9a7a77488e3a02c5c834b3880e48a48fe3ea160c (patch)
tree6a70bb5730c7fdd236e696a01e0c578ba4b7f7de /Command
parent0396f9c795749bc1ef14b26bdc1e1165b9c842b0 (diff)
tweak
Diffstat (limited to 'Command')
-rw-r--r--Command/Sync.hs22
1 files changed, 11 insertions, 11 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index e29f2893f..29211be92 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -27,9 +27,9 @@ import qualified Data.Map as M
def :: [Command]
def = [command "sync" (paramOptional (paramRepeating paramRemote))
- [seek] "synchronize local repository with remote repositories"]
+ [seek] "synchronize local repository with remotes"]
--- syncing involves several operations, any of which can independantly fail
+-- syncing involves several operations, any of which can independently fail
seek :: CommandSeek
seek rs = do
!branch <- currentBranch
@@ -106,11 +106,6 @@ updateBranch syncbranch =
, Param $ show $ Git.Ref.base syncbranch
]
-mergeFrom :: Git.Ref -> CommandCleanup
-mergeFrom branch = do
- showOutput
- inRepo $ Git.Command.runBool "merge" [Param $ show branch]
-
pullRemote :: Remote.Remote Annex -> Git.Ref -> CommandStart
pullRemote remote branch = do
showStart "pull" (Remote.name remote)
@@ -161,11 +156,16 @@ pushRemote remote branch = go =<< needpush
syncbranch = syncBranch branch
remotebranch = Git.Ref.under $ "refs/remotes/" ++ Remote.name remote
-currentBranch :: Annex Git.Ref
-currentBranch = Git.Ref . firstLine . L.unpack <$>
- inRepo (Git.Command.pipeRead [Param "symbolic-ref", Param "HEAD"])
-
mergeAnnex :: CommandStart
mergeAnnex = do
Annex.Branch.forceUpdate
stop
+
+currentBranch :: Annex Git.Ref
+currentBranch = Git.Ref . firstLine . L.unpack <$>
+ inRepo (Git.Command.pipeRead [Param "symbolic-ref", Param "HEAD"])
+
+mergeFrom :: Git.Ref -> CommandCleanup
+mergeFrom branch = do
+ showOutput
+ inRepo $ Git.Command.runBool "merge" [Param $ show branch]