This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6607

merge: disallow merge abort in case of an unfinished operation(issue6160)
ClosedPublic

Authored by taapas1128 on Jul 6 2019, 4:10 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb8d54f4625cb: merge: disallow merge abort in case of an unfinished operation (issue6160)
Summary

This patch disallows hg merge --abort in case an operation of higher
precedence i.e unshelve, rebase, histedit are in unfinished states.

This is done so as to avoid partial abort of these operations in case
merge abort is called at an interrupted step.

The patch adds a cmdutil.getunfinishedstate function which checks
for operations under progress and returns a statecheck object for it.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jul 6 2019, 4:10 AM
pulkit added a subscriber: pulkit.Jul 8 2019, 11:21 AM
pulkit added inline comments.
mercurial/commands.py
4017

We should first check if abort before performing this loop instead of checking later.

4019

we don't need to create a new variable. We can operate on state below.

taapas1128 updated this revision to Diff 15793.Jul 8 2019, 11:46 AM
taapas1128 marked 2 inline comments as done.Jul 8 2019, 11:47 AM
pulkit added inline comments.Jul 8 2019, 11:48 AM
mercurial/commands.py
4019

We are performing the same loop in https://phab.mercurial-scm.org/D6566. How about having a utility function which will return the unfinished state, something like getunfinishedstate

taapas1128 added a comment.Jul 8 2019, 12:14 PM

okay I will create that in cmdutil.py.

taapas1128 edited the summary of this revision. (Show Details)Jul 8 2019, 2:16 PM
taapas1128 added a child revision: D6566: abort: added logic for of hg abort.
taapas1128 updated this revision to Diff 15801.
pulkit added a comment.Jul 8 2019, 5:48 PM

Also, can you add an entry about this to relnotes/next?

mercurial/commands.py
4020

state can be None here.

taapas1128 updated this revision to Diff 15814.Jul 8 2019, 6:00 PM
taapas1128 marked an inline comment as done.Jul 8 2019, 6:02 PM

added the entry in relnotes.

mercurial/commands.py
4020

My bad I really shouldn't have missed that.

taapas1128 marked an inline comment as done.Jul 8 2019, 6:02 PM
pulkit accepted this revision.Jul 9 2019, 5:45 AM
This revision is now accepted and ready to land.Jul 9 2019, 5:45 AM
ryancoop987 added a subscriber: ryancoop987.Oct 21 2021, 4:04 AM

This is the latest online this play euchre free card game i am exited to all time see it

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (4 lines)
Mtests/test-shelve2.t (35 lines)

Diff 15793

mercurial/commands.py

all changes. all changes.
Returns 0 on success, 1 if there are unresolved files. Returns 0 on success, 1 if there are unresolved files.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
abort = opts.get('abort') abort = opts.get('abort')
if abort and repo.dirstate.p2() == nullid: if abort and repo.dirstate.p2() == nullid:
cmdutil.wrongtooltocontinue(repo, _('merge')) cmdutil.wrongtooltocontinue(repo, _('merge'))
pulkitUnsubmitted
Done

We should first check if abort before performing this loop instead of checking later.

pulkit: We should first check `if abort` before performing this loop instead of checking later.
if abort: if abort:
for state in statemod._unfinishedstates:
pulkitUnsubmitted
Done

we don't need to create a new variable. We can operate on state below.

pulkit: we don't need to create a new variable. We can operate on `state` below.
pulkitUnsubmitted
Not Done

We are performing the same loop in https://phab.mercurial-scm.org/D6566. How about having a utility function which will return the unfinished state, something like getunfinishedstate

pulkit: We are performing the same loop in https://phab.mercurial-scm.org/D6566. How about having a…
if state.isunfinished(repo) and state._opname != 'merge':
pulkitUnsubmitted
Done

state can be None here.

pulkit: state can be `None` here.
taapas1128AuthorUnsubmitted
Done

My bad I really shouldn't have missed that.

taapas1128: My bad I really shouldn't have missed that.
raise error.Abort(_('cannot abort merge with %s in progress') %
(state._opname), hint=state.hint())
if node: if node:
raise error.Abort(_("cannot specify a node with --abort")) raise error.Abort(_("cannot specify a node with --abort"))
if opts.get('rev'): if opts.get('rev'):
raise error.Abort(_("cannot specify both --rev and --abort")) raise error.Abort(_("cannot specify both --rev and --abort"))
if opts.get('preview'): if opts.get('preview'):
raise error.Abort(_("cannot specify --preview with --abort")) raise error.Abort(_("cannot specify --preview with --abort"))
if opts.get('rev') and node: if opts.get('rev') and node:
raise error.Abort(_("please specify just one revision")) raise error.Abort(_("please specify just one revision"))

tests/test-shelve2.t

$ cat .hg/shelved/default.shelve $ cat .hg/shelved/default.shelve
node=82e0cb9893247d12667017593ce1e5655860f1ac node=82e0cb9893247d12667017593ce1e5655860f1ac
$ hg unshelve --abort $ hg unshelve --abort
unshelve of 'default' aborted unshelve of 'default' aborted
#endif #endif
$ cd .. $ cd ..
Block merge abort when unshelve in progress(issue6160)
------------------------------------------------------
$ hg init a
$ cd a
$ echo foo > a ; hg commit -qAm "initial commit"
$ echo bar > a
$ hg shelve
shelved as default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foobar > a
$ hg unshelve
unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1]
$ hg log --template '{desc|firstline} {author} {date|isodate} \n' -r .
pending changes temporary commit shelve@localhost 1970-01-01 00:00 +0000
$ hg merge --abort
abort: cannot abort merge with unshelve in progress
(use 'hg unshelve --continue' or 'hg unshelve --abort')
[255]
$ hg unshelve --abort
unshelve of 'default' aborted
$ hg log -G --template '{desc|firstline} {author} {date|isodate} \n' -r .
@ initial commit test 1970-01-01 00:00 +0000
$ cd ..