aeca7c2207
The only price paid is one additional MVar read per write to the journal. Presumably writing a journal file dominiates over a MVar read time by several orders of magnitude. --batch does not get the speedup because then it needs to notice when another process has made a change. Also made the assistant and other damon modes bypass the optimisation, which would not help them anyway.
45 lines
1.3 KiB
Haskell
45 lines
1.3 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2011-2019 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.Merge where
|
|
|
|
import Command
|
|
import qualified Annex.Branch
|
|
import qualified Git
|
|
import qualified Git.Branch
|
|
import Annex.CurrentBranch
|
|
import Command.Sync (prepMerge, mergeLocal, mergeConfig, merge, SyncOptions(..))
|
|
|
|
cmd :: Command
|
|
cmd = command "merge" SectionMaintenance
|
|
"merge changes from remotes"
|
|
(paramOptional paramRef) (withParams seek)
|
|
|
|
seek :: CmdParams -> CommandSeek
|
|
seek [] = do
|
|
prepMerge
|
|
commandAction mergeAnnexBranch
|
|
commandAction mergeSyncedBranch
|
|
seek bs = do
|
|
prepMerge
|
|
forM_ bs (commandAction . mergeBranch . Git.Ref . encodeBS')
|
|
|
|
mergeAnnexBranch :: CommandStart
|
|
mergeAnnexBranch = starting "merge" (ActionItemOther (Just "git-annex")) $ do
|
|
_ <- Annex.Branch.update
|
|
-- commit explicitly, in case no remote branches were merged
|
|
Annex.Branch.commit =<< Annex.Branch.commitMessage
|
|
next $ return True
|
|
|
|
mergeSyncedBranch :: CommandStart
|
|
mergeSyncedBranch = mergeLocal mergeConfig def =<< getCurrentBranch
|
|
|
|
mergeBranch :: Git.Ref -> CommandStart
|
|
mergeBranch r = starting "merge" (ActionItemOther (Just (Git.fromRef r))) $ do
|
|
currbranch <- getCurrentBranch
|
|
let o = def { notOnlyAnnexOption = True }
|
|
next $ merge currbranch mergeConfig o Git.Branch.ManualCommit r
|