2014-07-11 20:45:18 +00:00
|
|
|
{- git-annex command
|
|
|
|
|
-
|
2015-01-21 16:50:09 +00:00
|
|
|
- Copyright 2014 Joey Hess <id@joeyh.name>
|
2014-07-11 20:45:18 +00:00
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2014-07-11 20:45:18 +00:00
|
|
|
-}
|
|
|
|
|
|
|
|
|
|
module Command.ResolveMerge where
|
|
|
|
|
|
|
|
|
|
import Command
|
|
|
|
|
import qualified Git
|
|
|
|
|
import Git.Sha
|
|
|
|
|
import qualified Git.Branch
|
|
|
|
|
import Annex.AutoMerge
|
|
|
|
|
|
2020-04-07 21:41:09 +00:00
|
|
|
import qualified Data.ByteString as S
|
|
|
|
|
|
2015-07-08 16:33:27 +00:00
|
|
|
cmd :: Command
|
2015-07-08 19:08:02 +00:00
|
|
|
cmd = command "resolvemerge" SectionPlumbing
|
2015-07-08 16:33:27 +00:00
|
|
|
"resolve merge conflicts"
|
2015-07-08 19:08:02 +00:00
|
|
|
paramNothing (withParams seek)
|
2014-07-11 20:45:18 +00:00
|
|
|
|
2015-07-08 19:08:02 +00:00
|
|
|
seek :: CmdParams -> CommandSeek
|
2018-10-01 18:12:06 +00:00
|
|
|
seek = withNothing (commandAction start)
|
2014-07-11 20:45:18 +00:00
|
|
|
|
|
|
|
|
start :: CommandStart
|
make CommandStart return a StartMessage
The goal is to be able to run CommandStart in the main thread when -J is
used, rather than unncessarily passing it off to a worker thread, which
incurs overhead that is signficant when the CommandStart is going to
quickly decide to stop.
To do that, the message it displays needs to be displayed in the worker
thread, after the CommandStart has run.
Also, the change will mean that CommandStart will no longer necessarily
run with the same Annex state as CommandPerform. While its docs already
said it should avoid modifying Annex state, I audited all the
CommandStart code as part of the conversion. (Note that CommandSeek
already sometimes runs with a different Annex state, and that has not been
a source of any problems, so I am not too worried that this change will
lead to breakage going forward.)
The only modification of Annex state I found was it calling
allowMessages in some Commands that default to noMessages. Dealt with
that by adding a startCustomOutput and a startingUsualMessages.
This lets a command start with noMessages and then select the output it
wants for each CommandStart.
One bit of breakage: onlyActionOn has been removed from commands that used it.
The plan is that, since a StartMessage contains an ActionItem,
when a Key can be extracted from that, the parallel job runner can
run onlyActionOn' automatically. Then commands won't need to worry about
this detail. Future work.
Otherwise, this was a fairly straightforward process of making each
CommandStart compile again. Hopefully other behavior changes were mostly
avoided.
In a few cases, a command had a CommandStart that called a CommandPerform
that then called showStart multiple times. I have collapsed those
down to a single start action. The main command to perhaps suffer from it
is Command.Direct, which used to show a start for each file, and no
longer does.
Another minor behavior change is that some commands used showStart
before, but had an associated file and a Key available, so were changed
to ShowStart with an ActionItemAssociatedFile. That will not change the
normal output or behavior, but --json output will now include the key.
This should not break it for anyone using a real json parser.
2019-06-06 19:42:30 +00:00
|
|
|
start = starting "resolvemerge" (ActionItemOther Nothing) $ do
|
2014-07-11 20:45:18 +00:00
|
|
|
us <- fromMaybe nobranch <$> inRepo Git.Branch.current
|
2019-12-09 17:49:05 +00:00
|
|
|
d <- fromRawFilePath <$> fromRepo Git.localGitDir
|
2014-07-11 20:45:18 +00:00
|
|
|
let merge_head = d </> "MERGE_HEAD"
|
|
|
|
|
them <- fromMaybe (error nomergehead) . extractSha
|
2020-04-07 21:41:09 +00:00
|
|
|
<$> liftIO (S.readFile merge_head)
|
2016-04-06 21:32:04 +00:00
|
|
|
ifM (resolveMerge (Just us) them False)
|
2014-07-11 20:59:49 +00:00
|
|
|
( do
|
|
|
|
|
void $ commitResolvedMerge Git.Branch.ManualCommit
|
make CommandStart return a StartMessage
The goal is to be able to run CommandStart in the main thread when -J is
used, rather than unncessarily passing it off to a worker thread, which
incurs overhead that is signficant when the CommandStart is going to
quickly decide to stop.
To do that, the message it displays needs to be displayed in the worker
thread, after the CommandStart has run.
Also, the change will mean that CommandStart will no longer necessarily
run with the same Annex state as CommandPerform. While its docs already
said it should avoid modifying Annex state, I audited all the
CommandStart code as part of the conversion. (Note that CommandSeek
already sometimes runs with a different Annex state, and that has not been
a source of any problems, so I am not too worried that this change will
lead to breakage going forward.)
The only modification of Annex state I found was it calling
allowMessages in some Commands that default to noMessages. Dealt with
that by adding a startCustomOutput and a startingUsualMessages.
This lets a command start with noMessages and then select the output it
wants for each CommandStart.
One bit of breakage: onlyActionOn has been removed from commands that used it.
The plan is that, since a StartMessage contains an ActionItem,
when a Key can be extracted from that, the parallel job runner can
run onlyActionOn' automatically. Then commands won't need to worry about
this detail. Future work.
Otherwise, this was a fairly straightforward process of making each
CommandStart compile again. Hopefully other behavior changes were mostly
avoided.
In a few cases, a command had a CommandStart that called a CommandPerform
that then called showStart multiple times. I have collapsed those
down to a single start action. The main command to perhaps suffer from it
is Command.Direct, which used to show a start for each file, and no
longer does.
Another minor behavior change is that some commands used showStart
before, but had an associated file and a Key available, so were changed
to ShowStart with an ActionItemAssociatedFile. That will not change the
normal output or behavior, but --json output will now include the key.
This should not break it for anyone using a real json parser.
2019-06-06 19:42:30 +00:00
|
|
|
next $ return True
|
2016-11-16 01:29:54 +00:00
|
|
|
, giveup "Merge conflict could not be automatically resolved."
|
2014-07-11 20:45:18 +00:00
|
|
|
)
|
|
|
|
|
where
|
2016-11-16 01:29:54 +00:00
|
|
|
nobranch = giveup "No branch is currently checked out."
|
|
|
|
|
nomergehead = giveup "No SHA found in .git/merge_head"
|