3a05d53761
No behavior changes (hopefully), just adding SeekInput and plumbing it through to the JSON display code for later use. Over the course of 2 grueling days. withFilesNotInGit reimplemented in terms of seekHelper should be the only possible behavior change. It seems to test as behaving the same. Note that seekHelper dummies up the SeekInput in the case where segmentPaths' gives up on sorting the expanded paths because there are too many input paths. When SeekInput later gets exposed as a json field, that will result in it being a little bit wrong in the case where 100 or more paths are passed to a git-annex command. I think this is a subtle enough problem to not matter. If it does turn out to be a problem, fixing it would require splitting up the input parameters into groups of < 100, which would make git ls-files run perhaps more than is necessary. May want to revisit this, because that fix seems fairly low-impact.
41 lines
1.1 KiB
Haskell
41 lines
1.1 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2014 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.ResolveMerge where
|
|
|
|
import Command
|
|
import qualified Git
|
|
import Git.Sha
|
|
import qualified Git.Branch
|
|
import Annex.AutoMerge
|
|
|
|
import qualified Data.ByteString as S
|
|
|
|
cmd :: Command
|
|
cmd = command "resolvemerge" SectionPlumbing
|
|
"resolve merge conflicts"
|
|
paramNothing (withParams seek)
|
|
|
|
seek :: CmdParams -> CommandSeek
|
|
seek = withNothing (commandAction start)
|
|
|
|
start :: CommandStart
|
|
start = starting "resolvemerge" (ActionItemOther Nothing) (SeekInput []) $ do
|
|
us <- fromMaybe nobranch <$> inRepo Git.Branch.current
|
|
d <- fromRawFilePath <$> fromRepo Git.localGitDir
|
|
let merge_head = d </> "MERGE_HEAD"
|
|
them <- fromMaybe (error nomergehead) . extractSha
|
|
<$> liftIO (S.readFile merge_head)
|
|
ifM (resolveMerge (Just us) them False)
|
|
( do
|
|
void $ commitResolvedMerge Git.Branch.ManualCommit
|
|
next $ return True
|
|
, giveup "Merge conflict could not be automatically resolved."
|
|
)
|
|
where
|
|
nobranch = giveup "No branch is currently checked out."
|
|
nomergehead = giveup "No SHA found in .git/merge_head"
|