This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6588

abort: added support for merge
ClosedPublic

Authored by taapas1128 on Jun 29 2019, 3:38 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3bc400ccbf99: abort: added support for merge
Summary

This adds support of hg merge --abort to hg abort plan.

This involves refactoring hg.merge into two different
functions removing the abort logic of merge from hg.merge
and then creating a seperate hg.abortmerge to handle the
abort logic so that the abortion of merge can be called
independently.

hg.abortmerge is then registered as abortfunc for the
state detection API so that commands.abort can use it to
deal with an unfinished merge operation.

Results are shown as tests.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jun 29 2019, 3:38 PM
pulkit added a subscriber: pulkit.Jun 30 2019, 3:23 PM
pulkit added inline comments.
mercurial/commands.py
151

let's refactor some code and create a function for merge abort instead of special casing it.

mercurial/hg.py
958–959

We can compute node required here again, and hence take this abort related code into a separate function.

taapas1128 updated this revision to Diff 15749.Jul 2 2019, 4:00 PM
taapas1128 marked 2 inline comments as done.Jul 2 2019, 4:01 PM
pulkit added inline comments.Jul 2 2019, 5:51 PM
mercurial/hg.py
959

we can directly pass repo.ui here. No need to have a ui variable

959

we actually don't need stats back here is we call _showstats() in abort merge. The stats related lines below can be moved to if condition above. Hence removing the asflag argument.

taapas1128 edited the summary of this revision. (Show Details)Jul 3 2019, 7:02 PM
taapas1128 updated this revision to Diff 15755.
taapas1128 marked 2 inline comments as done.Jul 3 2019, 7:07 PM
taapas1128 updated this revision to Diff 15760.Jul 4 2019, 1:29 PM
pulkit added inline comments.Jul 4 2019, 1:38 PM
tests/test-commit-unresolved.t
51

since there are only two cases, you can use #else here.

150

We can put only the command in if and else part. The output is same on the both sides.

pulkit added inline comments.Jul 4 2019, 1:40 PM
tests/test-commit-unresolved.t
2

abortcommand will be better name instead of hgabort as that will match the way we named abortflag and will be more easier to realise the difference between them.

taapas1128 updated this revision to Diff 15761.Jul 4 2019, 1:45 PM
taapas1128 marked 3 inline comments as done.Jul 4 2019, 1:48 PM
taapas1128 marked an inline comment as not done.
pulkit added inline comments.Jul 4 2019, 1:49 PM
tests/test-commit-unresolved.t
46–47

hg abort can be used. we can case the output here.

taapas1128 updated this revision to Diff 15770.Jul 4 2019, 5:08 PM
taapas1128 marked 2 inline comments as done.Jul 4 2019, 5:10 PM
taapas1128 updated this revision to Diff 15783.Jul 6 2019, 2:55 PM
taapas1128 edited the summary of this revision. (Show Details)Jul 8 2019, 2:18 PM
taapas1128 updated this revision to Diff 15808.
taapas1128 edited the summary of this revision. (Show Details)Jul 9 2019, 8:25 AM
taapas1128 updated this revision to Diff 15835.
pulkit accepted this revision.Jul 10 2019, 8:58 AM
This revision is now accepted and ready to land.Jul 10 2019, 8:58 AM
pulkit added inline comments.Jul 10 2019, 1:12 PM
mercurial/hg.py
985

We lost return stats.unresolvedcount > 0 in this code movement.

taapas1128 updated this revision to Diff 15858.Jul 10 2019, 2:22 PM
taapas1128 marked an inline comment as done.Jul 10 2019, 2:22 PM
taapas1128 updated this revision to Diff 15867.Jul 10 2019, 3:35 PM
pulkit requested changes to this revision.Jul 10 2019, 4:25 PM
pulkit added inline comments.
mercurial/hg.py
985

This is not yet addressed.

This revision now requires changes to proceed.Jul 10 2019, 4:25 PM
taapas1128 updated this revision to Diff 15879.Jul 10 2019, 4:40 PM
taapas1128 marked an inline comment as done.Jul 10 2019, 4:41 PM
pulkit added inline comments.Jul 10 2019, 4:46 PM
mercurial/hg.py
987

Here the user is already running hg merge --abort, so we should not show this message.

Ideally, this if condition should not never when aborting a merge.

pulkit accepted this revision.Jul 10 2019, 4:50 PM
pulkit added inline comments.
mercurial/hg.py
987

Turns out I am blind and the previous version already had everything correct. I will either apply previous version of fix things in flight.

This revision is now accepted and ready to land.Jul 10 2019, 4:50 PM
taapas1128 updated this revision to Diff 15880.Jul 10 2019, 4:52 PM
taapas1128 marked an inline comment as done.Jul 10 2019, 4:55 PM
taapas1128 added a commit: rHG3bc400ccbf99: abort: added support for merge.Jul 10 2019, 5:10 PM
Closed by commit rHG3bc400ccbf99: abort: added support for merge (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (8 lines)
Mmercurial/hg.py (38 lines)
Mmercurial/state.py (7 lines)
Mtests/test-commit-unresolved.t (24 lines)
Mtests/test-shelve2.t (13 lines)

Diff 15858

mercurial/commands.py

use --dry-run/-n to dry run the command. use --dry-run/-n to dry run the command.
A new operation can be added to this by registering the operation and A new operation can be added to this by registering the operation and
abort logic in the unfinishedstates list under statemod. abort logic in the unfinishedstates list under statemod.
""" """
dryrun = opts.get(r'dry_run') dryrun = opts.get(r'dry_run')
abortstate = cmdutil.getunfinishedstate(repo) abortstate = cmdutil.getunfinishedstate(repo)
if not abortstate: if not abortstate:
raise error.Abort(_('no operation in progress')) raise error.Abort(_('no operation in progress'))
if not abortstate.abortfunc: if not abortstate.abortfunc:
pulkitUnsubmitted
Done

let's refactor some code and create a function for merge abort instead of special casing it.

pulkit: let's refactor some code and create a function for merge abort instead of special casing it.
raise error.Abort((_("%s in progress but does not support 'hg abort'") % raise error.Abort((_("%s in progress but does not support 'hg abort'") %
(abortstate._opname)), hint=abortstate.hint()) (abortstate._opname)), hint=abortstate.hint())
if dryrun: if dryrun:
ui.status(_('%s in progress, will be aborted\n') % (abortstate._opname)) ui.status(_('%s in progress, will be aborted\n') % (abortstate._opname))
return return
return abortstate.abortfunc(ui, repo) return abortstate.abortfunc(ui, repo)
@command('add', @command('add',
# ui.forcemerge is an internal variable, do not document # ui.forcemerge is an internal variable, do not document
overrides = {('ui', 'forcemerge'): opts.get('tool', '')} overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
with ui.configoverride(overrides, 'merge'): with ui.configoverride(overrides, 'merge'):
force = opts.get('force') force = opts.get('force')
labels = ['working copy', 'merge rev'] labels = ['working copy', 'merge rev']
return hg.merge(repo, node, force=force, mergeforce=force, return hg.merge(repo, node, force=force, mergeforce=force,
labels=labels, abort=abort) labels=labels, abort=abort)
statemod.addunfinished(
'merge', fname=None, clearable=True, allowcommit=True,
cmdmsg=_('outstanding uncommitted merge'), abortfunc=hg.abortmerge,
statushint=_('To continue: hg commit\n'
'To abort: hg merge --abort'),
cmdhint=_("use 'hg commit' or 'hg merge --abort'")
)
@command('outgoing|out', @command('outgoing|out',
[('f', 'force', None, _('run even when the destination is unrelated')), [('f', 'force', None, _('run even when the destination is unrelated')),
('r', 'rev', [], ('r', 'rev', [],
_('a changeset intended to be included in the destination'), _('REV')), _('a changeset intended to be included in the destination'), _('REV')),
('n', 'newest-first', None, _('show newest record first')), ('n', 'newest-first', None, _('show newest record first')),
('B', 'bookmarks', False, _('compare bookmarks')), ('B', 'bookmarks', False, _('compare bookmarks')),
('b', 'branch', [], _('a specific branch you would like to push'), ('b', 'branch', [], _('a specific branch you would like to push'),
_('BRANCH')), _('BRANCH')),

mercurial/hg.py

if warndest: if warndest:
destutil.statusotherdests(ui, repo) destutil.statusotherdests(ui, repo)
return ret return ret
def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None, def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None,
abort=False): abort=False):
"""Branch merge with node, resolving changes. Return true if any """Branch merge with node, resolving changes. Return true if any
unresolved conflicts.""" unresolved conflicts."""
if not abort: if abort:
pulkitUnsubmitted
Done

We can compute node required here again, and hence take this abort related code into a separate function.

pulkit: We can compute node required here again, and hence take this abort related code into a separate…
pulkitUnsubmitted
Done

we can directly pass repo.ui here. No need to have a ui variable

pulkit: we can directly pass repo.ui here. No need to have a ui variable
pulkitUnsubmitted
Done

we actually don't need stats back here is we call _showstats() in abort merge. The stats related lines below can be moved to if condition above. Hence removing the asflag argument.

pulkit: we actually don't need stats back here is we call `_showstats()` in abort merge. The stats…
return abortmerge(repo.ui, repo, labels=labels)
stats = mergemod.update(repo, node, branchmerge=True, force=force, stats = mergemod.update(repo, node, branchmerge=True, force=force,
mergeforce=mergeforce, labels=labels) mergeforce=mergeforce, labels=labels)
else: _showstats(repo, stats)
if stats.unresolvedcount:
repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
"or 'hg merge --abort' to abandon\n"))
elif remind and not abort:
repo.ui.status(_("(branch merge, don't forget to commit)\n"))
return stats.unresolvedcount > 0
def abortmerge(ui, repo, labels=None):
ms = mergemod.mergestate.read(repo) ms = mergemod.mergestate.read(repo)
if ms.active(): if ms.active():
# there were conflicts # there were conflicts
node = ms.localctx.hex() node = ms.localctx.hex()
else: else:
# there were no conficts, mergestate was not stored # there were no conficts, mergestate was not stored
node = repo['.'].hex() node = repo['.'].hex()
repo.ui.status(_("aborting the merge, updating back to" repo.ui.status(_("aborting the merge, updating back to"
" %s\n") % node[:12]) " %s\n") % node[:12])
stats = mergemod.update(repo, node, branchmerge=False, force=True, stats = mergemod.update(repo, node, branchmerge=False, force=True,
labels=labels) labels=labels)
_showstats(repo, stats) _showstats(repo, stats)
pulkitUnsubmitted
Done

We lost return stats.unresolvedcount > 0 in this code movement.

pulkit: We lost `return stats.unresolvedcount > 0` in this code movement.
pulkitUnsubmitted
Done

This is not yet addressed.

pulkit: This is not yet addressed.
if stats.unresolvedcount:
repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
"or 'hg merge --abort' to abandon\n"))
elif remind and not abort:
repo.ui.status(_("(branch merge, don't forget to commit)\n"))
return stats.unresolvedcount > 0 return stats.unresolvedcount > 0
pulkitUnsubmitted
Done

Here the user is already running hg merge --abort, so we should not show this message.

Ideally, this if condition should not never when aborting a merge.

pulkit: Here the user is already running `hg merge --abort`, so we should not show this message.
pulkitUnsubmitted
Not Done

Turns out I am blind and the previous version already had everything correct. I will either apply previous version of fix things in flight.

pulkit: Turns out I am blind and the previous version already had everything correct. I will either…
def _incoming(displaychlist, subreporecurse, ui, repo, source, def _incoming(displaychlist, subreporecurse, ui, repo, source,
opts, buffered=False): opts, buffered=False):
""" """
Helper for incoming / gincoming. Helper for incoming / gincoming.
displaychlist gets called with displaychlist gets called with
(remoterepo, incomingchangesetlist, displayer) parameters, (remoterepo, incomingchangesetlist, displayer) parameters,
and is supposed to contain only code that can't be unified. and is supposed to contain only code that can't be unified.
""" """

mercurial/state.py

statushint=_("To continue: hg update") statushint=_("To continue: hg update")
) )
addunfinished( addunfinished(
'bisect', fname='bisect.state', allowcommit=True, reportonly=True, 'bisect', fname='bisect.state', allowcommit=True, reportonly=True,
statushint=_('To mark the changeset good: hg bisect --good\n' statushint=_('To mark the changeset good: hg bisect --good\n'
'To mark the changeset bad: hg bisect --bad\n' 'To mark the changeset bad: hg bisect --bad\n'
'To abort: hg bisect --reset\n') 'To abort: hg bisect --reset\n')
) )
addunfinished(
'merge', fname=None, clearable=True, allowcommit=True,
cmdmsg=_('outstanding uncommitted merge'),
statushint=_('To continue: hg commit\n'
'To abort: hg merge --abort'),
cmdhint=_("use 'hg commit' or 'hg merge --abort'")
)
def getrepostate(repo): def getrepostate(repo):
# experimental config: commands.status.skipstates # experimental config: commands.status.skipstates
skip = set(repo.ui.configlist('commands', 'status.skipstates')) skip = set(repo.ui.configlist('commands', 'status.skipstates'))
for state in _unfinishedstates: for state in _unfinishedstates:
if state._opname in skip: if state._opname in skip:
continue continue
if state.isunfinished(repo): if state.isunfinished(repo):
return (state._opname, state.statusmsg()) return (state._opname, state.statusmsg())

tests/test-commit-unresolved.t

#testcases abortcommand abortflag
#if abortflag
pulkitUnsubmitted
Done

abortcommand will be better name instead of hgabort as that will match the way we named abortflag and will be more easier to realise the difference between them.

pulkit: `abortcommand` will be better name instead of `hgabort` as that will match the way we named…
$ cat >> $HGRCPATH <<EOF
> [alias]
> abort = merge --abort
> EOF
#endif
$ addcommit () { $ addcommit () {
> echo $1 > $1 > echo $1 > $1
> hg add $1 > hg add $1
> hg commit -d "${2} 0" -m $1 > hg commit -d "${2} 0" -m $1
> } > }
$ commit () { $ commit () {
> hg commit -d "${2} 0" -m $1 > hg commit -d "${2} 0" -m $1
parent: 3:e45016d2b3d3 tip parent: 3:e45016d2b3d3 tip
D D
branch: default branch: default
commit: (clean) commit: (clean)
update: 2 new changesets, 2 branch heads (merge) update: 2 new changesets, 2 branch heads (merge)
phases: 4 draft phases: 4 draft
Testing the abort functionality first in case of conflicts Testing the abort functionality first in case of conflicts
$ hg merge --abort $ hg abort
pulkitUnsubmitted
Done

hg abort can be used. we can case the output here.

pulkit: `hg abort` can be used. we can case the output here.
abort: no merge in progress abort: no merge in progress (abortflag !)
abort: no operation in progress (abortcommand !)
[255] [255]
pulkitUnsubmitted
Done

since there are only two cases, you can use #else here.

pulkit: since there are only two cases, you can use `#else` here.
$ hg merge $ hg merge
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
1 files updated, 0 files merged, 0 files removed, 1 files unresolved 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg merge --abort e4501 $ hg merge --abort e4501
abort: cannot specify a node with --abort abort: cannot specify a node with --abort
[255] [255]
$ hg merge --abort --rev e4501 $ hg merge --abort --rev e4501
abort: cannot specify both --rev and --abort abort: cannot specify both --rev and --abort
[255] [255]
$ hg merge --abort #if abortcommand
when in dry-run mode
$ hg abort --dry-run
merge in progress, will be aborted
#endif
$ hg abort
aborting the merge, updating back to e45016d2b3d3 aborting the merge, updating back to e45016d2b3d3
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Checking that we got back in the same state Checking that we got back in the same state
$ hg status $ hg status
? A.orig ? A.orig
$ hg id $ hg id
$ hg merge -r 4 $ hg merge -r 4
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg merge --preview --abort $ hg merge --preview --abort
abort: cannot specify --preview with --abort abort: cannot specify --preview with --abort
[255] [255]
$ hg merge --abort $ hg abort
pulkitUnsubmitted
Done

We can put only the command in if and else part. The output is same on the both sides.

pulkit: We can put only the command in `if` and `else` part. The output is same on the both sides.
aborting the merge, updating back to 68352a18a7c4 aborting the merge, updating back to 68352a18a7c4
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg id $ hg id
68352a18a7c4 tip 68352a18a7c4 tip
$ cd .. $ cd ..

tests/test-shelve2.t

$ hg abort $ hg abort
abort: could not read shelved state file, your working copy may be in an unexpected state abort: could not read shelved state file, your working copy may be in an unexpected state
please update to some commit please update to some commit
[255] [255]
Unshelve --abort fails with appropriate message if there's no unshelve in Unshelve --abort fails with appropriate message if there's no unshelve in
progress progress
$ hg abort
abort: no unshelve in progress (abortflag !) #if abortflag
abort: merge in progress but does not support 'hg abort' (no-abortflag !) $ hg unshelve --abort
(use 'hg commit' or 'hg merge --abort') (no-abortflag !) abort: no unshelve in progress
[255] [255]
#else
$ hg abort
aborting the merge, updating back to 9451eaa6eee3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif
$ cd .. $ cd ..
Unshelve respects --keep even if user intervention is needed Unshelve respects --keep even if user intervention is needed
$ hg init unshelvekeep && cd unshelvekeep $ hg init unshelvekeep && cd unshelvekeep
$ echo 1 > file && hg ci -Am 1 $ echo 1 > file && hg ci -Am 1
adding file adding file
$ echo 2 >> file $ echo 2 >> file
$ hg shelve $ hg shelve