This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3668

graft: add a new `--stop` flag to stop interrupted graft
ClosedPublic

Authored by pulkit on May 29 2018, 4:43 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2ec44160165d: graft: add a new `--stop` flag to stop interrupted graft
rHG94e4a283c6d7: graft: add a new `--stop` flag to stop interrupted graft
Summary

This patch adds a new flag --stop to hg graft command which stops the
interrupted graft.

The --stop flag takes back you to the last successful step i.e. it will keep
your grafted commits, it will just clear the mergestate and interrupted graft
state.

The --stop is different from --abort flag as the latter also undoes all the
work done till now which is sometimes not what the user wants.

Suppose you grafted a lot of changesets, you encountered conflicts, you resolved
them, did hg graft --continue, again encountered conflicts, continue, again
encountered conflicts. Now you are tired of solving merge conflicts and want to
resume this sometimes later. If you use the --abort functionality, it will
strip your already grafted changesets, making you loose the work you have done
resolving merge conflicts.

A general goal related to this flag is to add this flag to rebase and
histedit too. The evolve command already has this --stop flag.

Tests are added for the new flag.

.. feature:: hg graft now has a --stop flag to stop interrupted graft

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.May 29 2018, 4:43 PM
yuja added a subscriber: yuja.Jun 5 2018, 8:07 AM
The `--stop` flag takes back you to the last successful step i.e. it will keep
your grafted commits, it will just clear the mergestate and interrupted graft
state.

No idea if git is right regarding UI, but they appear to have --quit for
this.

https://git-scm.com/docs/git-cherry-pick

The code looks good to me. We'll need to update cmdutil.unfinishedstates
as well.

pulkit added a comment.Jun 11 2018, 3:45 PM
In D3668#58070, @yuja wrote:
The `--stop` flag takes back you to the last successful step i.e. it will keep
your grafted commits, it will just clear the mergestate and interrupted graft
state.

No idea if git is right regarding UI, but they appear to have --quit for
this.
https://git-scm.com/docs/git-cherry-pick

I asked people on IRC, nbjoerg and one more said '--stop' is better. However I am fine with changing that to --quit

The code looks good to me. We'll need to update cmdutil.unfinishedstates
as well.

Will do. I was also thinking to add a new general help topic which will document about --continue, --abort and --stop flags and point them as help text or "help text of help text" there.

pulkit updated this revision to Diff 9013.Jun 11 2018, 4:56 PM
yuja added a comment.Jun 12 2018, 8:18 AM
In https://phab.mercurial-scm.org/D3668#58070, @yuja wrote:
> >   The `--stop` flag takes back you to the last successful step i.e. it will keep
> >   your grafted commits, it will just clear the mergestate and interrupted graft
> >   state.
>
> No idea if git is right regarding UI, but they appear to have `--quit` for
>  this.
>
> https://git-scm.com/docs/git-cherry-pick
I asked people on IRC, nbjoerg and one more said '--stop' is better. However I am fine with changing that to `--quit`

Good. Since I don't have any preference either, let's just stick to --stop.

Replaced some --abort in error message and queued, thanks.

Closed by commit rHG94e4a283c6d7: graft: add a new `--stop` flag to stop interrupted graft (authored by pulkit). · Explain WhyJun 12 2018, 8:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)
Mmercurial/commands.py (21 lines)
Mtests/test-completion.t (2 lines)
Mtests/test-graft.t (107 lines)

Diff 9022

mercurial/cmdutil.py

summaryremotehooks = util.hooks() summaryremotehooks = util.hooks()
# A list of state files kept by multistep operations like graft. # A list of state files kept by multistep operations like graft.
# Since graft cannot be aborted, it is considered 'clearable' by update. # Since graft cannot be aborted, it is considered 'clearable' by update.
# note: bisect is intentionally excluded # note: bisect is intentionally excluded
# (state file, clearable, allowcommit, error, hint) # (state file, clearable, allowcommit, error, hint)
unfinishedstates = [ unfinishedstates = [
('graftstate', True, False, _('graft in progress'), ('graftstate', True, False, _('graft in progress'),
_("use 'hg graft --continue' or 'hg update' to abort")), _("use 'hg graft --continue' or 'hg graft --stop' to abort")),
('updatestate', True, False, _('last update was interrupted'), ('updatestate', True, False, _('last update was interrupted'),
_("use 'hg update' to get a consistent checkout")) _("use 'hg update' to get a consistent checkout"))
] ]
def checkunfinished(repo, commit=False): def checkunfinished(repo, commit=False):
'''Look for an unfinished multistep operation, like graft, and abort '''Look for an unfinished multistep operation, like graft, and abort
if found. It's probably good to check this right before if found. It's probably good to check this right before
bailifchanged(). bailifchanged().

mercurial/commands.py

explicitonly=False, dryrun=dryrun, explicitonly=False, dryrun=dryrun,
interactive=interactive)[0] interactive=interactive)[0]
return rejected and 1 or 0 return rejected and 1 or 0
@command( @command(
'graft', 'graft',
[('r', 'rev', [], _('revisions to graft'), _('REV')), [('r', 'rev', [], _('revisions to graft'), _('REV')),
('c', 'continue', False, _('resume interrupted graft')), ('c', 'continue', False, _('resume interrupted graft')),
('', 'stop', False, _('stop interrupted graft')),
('e', 'edit', False, _('invoke editor on commit messages')), ('e', 'edit', False, _('invoke editor on commit messages')),
('', 'log', None, _('append graft info to log message')), ('', 'log', None, _('append graft info to log message')),
('f', 'force', False, _('force graft')), ('f', 'force', False, _('force graft')),
('D', 'currentdate', False, ('D', 'currentdate', False,
_('record the current date as commit date')), _('record the current date as commit date')),
('U', 'currentuser', False, ('U', 'currentuser', False,
_('record the current user as committer'), _('DATE'))] _('record the current user as committer'), _('DATE'))]
+ commitopts2 + mergetoolopts + dryrunopts, + commitopts2 + mergetoolopts + dryrunopts,
if not opts.get('date') and opts.get('currentdate'): if not opts.get('date') and opts.get('currentdate'):
opts['date'] = "%d %d" % dateutil.makedate() opts['date'] = "%d %d" % dateutil.makedate()
editor = cmdutil.getcommiteditor(editform='graft', editor = cmdutil.getcommiteditor(editform='graft',
**pycompat.strkwargs(opts)) **pycompat.strkwargs(opts))
cont = False cont = False
graftstate = statemod.cmdstate(repo, 'graftstate') graftstate = statemod.cmdstate(repo, 'graftstate')
if opts.get('stop'):
if opts.get('continue'):
raise error.Abort(_("cannot use '--continue' and "
"'--stop' together"))
if any((opts.get('edit'), opts.get('log'), opts.get('user'),
opts.get('date'), opts.get('currentdate'),
opts.get('currentuser'), opts.get('rev'))):
raise error.Abort(_("cannot specify any other flag with '--stop'"))
return _stopgraft(ui, repo, graftstate)
if opts.get('continue'): if opts.get('continue'):
cont = True cont = True
if revs: if revs:
raise error.Abort(_("can't specify --continue and revisions")) raise error.Abort(_("can't specify --continue and revisions"))
# read in unfinished revisions # read in unfinished revisions
if graftstate.exists(): if graftstate.exists():
statedata = _readgraftstate(repo, graftstate) statedata = _readgraftstate(repo, graftstate)
if statedata.get('date'): if statedata.get('date'):
def _readgraftstate(repo, graftstate): def _readgraftstate(repo, graftstate):
"""read the graft state file and return a dict of the data stored in it""" """read the graft state file and return a dict of the data stored in it"""
try: try:
return graftstate.read() return graftstate.read()
except error.CorruptedState: except error.CorruptedState:
nodes = repo.vfs.read('graftstate').splitlines() nodes = repo.vfs.read('graftstate').splitlines()
return {'nodes': nodes} return {'nodes': nodes}
def _stopgraft(ui, repo, graftstate):
"""stop the interrupted graft"""
if not graftstate.exists():
raise error.Abort(_("no interrupted graft found"))
pctx = repo['.']
hg.updaterepo(repo, pctx.node(), True)
graftstate.delete()
ui.status(_("stopped the interrupted graft\n"))
ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
return 0
@command('grep', @command('grep',
[('0', 'print0', None, _('end fields with NUL')), [('0', 'print0', None, _('end fields with NUL')),
('', 'all', None, _('print all revisions that match')), ('', 'all', None, _('print all revisions that match')),
('a', 'text', None, _('treat all files as text')), ('a', 'text', None, _('treat all files as text')),
('f', 'follow', None, ('f', 'follow', None,
_('follow changeset history,' _('follow changeset history,'
' or file history across copies and renames')), ' or file history across copies and renames')),
('i', 'ignore-case', None, _('ignore case when matching')), ('i', 'ignore-case', None, _('ignore case when matching')),

tests/test-completion.t

debuguiprompt: prompt debuguiprompt: prompt
debugupdatecaches: debugupdatecaches:
debugupgraderepo: optimize, run debugupgraderepo: optimize, run
debugwalk: include, exclude debugwalk: include, exclude
debugwhyunstable: debugwhyunstable:
debugwireargs: three, four, five, ssh, remotecmd, insecure debugwireargs: three, four, five, ssh, remotecmd, insecure
debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure
files: rev, print0, include, exclude, template, subrepos files: rev, print0, include, exclude, template, subrepos
graft: rev, continue, edit, log, force, currentdate, currentuser, date, user, tool, dry-run graft: rev, continue, stop, edit, log, force, currentdate, currentuser, date, user, tool, dry-run
grep: print0, all, text, follow, ignore-case, files-with-matches, line-number, rev, user, date, template, include, exclude grep: print0, all, text, follow, ignore-case, files-with-matches, line-number, rev, user, date, template, include, exclude
heads: rev, topo, active, closed, style, template heads: rev, topo, active, closed, style, template
help: extension, command, keyword, system help: extension, command, keyword, system
identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure, template identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure, template
import: strip, base, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity import: strip, base, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity
incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
locate: rev, print0, fullpath, include, exclude locate: rev, print0, fullpath, include, exclude
manifest: rev, all, template manifest: rev, all, template

tests/test-graft.t

# To continue: hg graft --continue # To continue: hg graft --continue
# To abort: hg update --clean . (warning: this will discard uncommitted changes) # To abort: hg update --clean . (warning: this will discard uncommitted changes)
Commit while interrupted should fail: Commit while interrupted should fail:
$ hg ci -m 'commit interrupted graft' $ hg ci -m 'commit interrupted graft'
abort: graft in progress abort: graft in progress
(use 'hg graft --continue' or 'hg update' to abort) (use 'hg graft --continue' or 'hg graft --stop' to abort)
[255] [255]
Abort the graft and try committing: Abort the graft and try committing:
$ hg up -C . $ hg up -C .
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo c >> e $ echo c >> e
$ hg ci -mtest $ hg ci -mtest
$ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.' $ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.'
@ 11:30c1050a58b2 added c @ 11:30c1050a58b2 added c
| (grafted from 8be98ac1a56990c2d9ca6861041b8390af7bd6f3) | (grafted from 8be98ac1a56990c2d9ca6861041b8390af7bd6f3)
o 10:ec7eda2313e2 added b o 10:ec7eda2313e2 added b
| (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6) | (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6)
o 3:9e887f7a939c bar to b o 3:9e887f7a939c bar to b
| |
~ ~
$ cd ..
Testing the --stop flag of `hg graft` which stops the interrupted graft
$ hg init stopgraft
$ cd stopgraft
$ for ch in a b c d; do echo $ch > $ch; hg add $ch; hg ci -Aqm "added "$ch; done;
$ hg log -G
@ changeset: 3:9150fe93bec6
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: added d
|
o changeset: 2:155349b645be
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: added c
|
o changeset: 1:5f6d8a4bf34a
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: added b
|
o changeset: 0:9092f1db7931
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: added a
$ hg up '.^^'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo foo > d
$ hg ci -Aqm "added foo to d"
$ hg graft --stop
abort: no interrupted graft found
[255]
$ hg graft -r 3
grafting 3:9150fe93bec6 "added d"
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')
[255]
$ hg graft --stop --continue
abort: cannot use '--continue' and '--stop' together
[255]
$ hg graft --stop -U
abort: cannot specify any other flag with '--stop'
[255]
$ hg graft --stop --rev 4
abort: cannot specify any other flag with '--stop'
[255]
$ hg graft --stop --log
abort: cannot specify any other flag with '--stop'
[255]
$ hg graft --stop
stopped the interrupted graft
working directory is now at a0deacecd59d
$ hg diff
$ hg log -Gr '.'
@ changeset: 4:a0deacecd59d
| tag: tip
~ parent: 1:5f6d8a4bf34a
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: added foo to d
$ hg graft -r 2 -r 3
grafting 2:155349b645be "added c"
grafting 3:9150fe93bec6 "added d"
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')
[255]
$ hg graft --stop
stopped the interrupted graft
working directory is now at 75b447541a9e
$ hg diff
$ hg log -G -T "{rev}:{node|short} {desc}"
@ 5:75b447541a9e added c
|
o 4:a0deacecd59d added foo to d
|
| o 3:9150fe93bec6 added d
| |
| o 2:155349b645be added c
|/
o 1:5f6d8a4bf34a added b
|
o 0:9092f1db7931 added a