1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
{- git-annex command
-
- Copyright 2011-2021 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, notOnlyAnnexOption, parseUnrelatedHistoriesOption)
import Git.Types
cmd :: Command
cmd = withAnnexOptions [jsonOptions] $
command "merge" SectionMaintenance
"merge changes from remotes"
(paramOptional paramRef) (seek <$$> optParser)
data MergeOptions = MergeOptions
{ mergeBranches :: [String]
, allowUnrelatedHistories :: Bool
}
optParser :: CmdParamsDesc -> Parser MergeOptions
optParser desc = MergeOptions
<$> cmdParams desc
<*> parseUnrelatedHistoriesOption
seek :: MergeOptions -> CommandSeek
seek o
| mergeBranches o == [] = do
prepMerge
commandAction mergeAnnexBranch
commandAction (mergeSyncedBranch o)
| otherwise = do
prepMerge
forM_ (mergeBranches o) $
commandAction . mergeBranch o . Git.Ref . encodeBS
mergeAnnexBranch :: CommandStart
mergeAnnexBranch = starting "merge" ai si $ do
_ <- Annex.Branch.update
-- commit explicitly, in case no remote branches were merged
Annex.Branch.commit =<< Annex.Branch.commitMessage
next $ return True
where
ai = ActionItemOther (Just (UnquotedString (fromRef Annex.Branch.name)))
si = SeekInput []
mergeSyncedBranch :: MergeOptions -> CommandStart
mergeSyncedBranch o = do
mc <- mergeConfig (allowUnrelatedHistories o)
mergeLocal mc def =<< getCurrentBranch
mergeBranch :: MergeOptions -> Git.Ref -> CommandStart
mergeBranch o r = starting "merge" ai si $ do
currbranch <- getCurrentBranch
mc <- mergeConfig (allowUnrelatedHistories o)
let so = def { notOnlyAnnexOption = True }
next $ merge currbranch mc so Git.Branch.ManualCommit [r]
where
ai = ActionItemOther (Just (UnquotedString (Git.fromRef r)))
si = SeekInput []
|
