This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3754

graft: introduce --abort flag to abort interrupted graft
ClosedPublic

Authored by pulkit on Jun 15 2018, 4:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5cdfc20bfd5f: graft: introduce --abort flag to abort interrupted graft
Summary

This patch introduces a new --abort flag to hg graft command which aborts an
interrupted graft and rollbacks to the state before graft.

The behavior when some of grafted changeset get's published while interrupted
graft or we have new descendants on grafted changesets is same as that of rebase
which is warn the user, don't strip and abort the abort the graft.

Tests are added for the new flag.

.. feature::

`hg graft` now has a `--abort` flag which aborts the interrupted graft and
rollbacks to state before the 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.Jun 15 2018, 4:09 PM
yuja added a subscriber: yuja.Jun 16 2018, 10:04 AM

+def _abortgraft(ui, repo, graftstate):
+ """abort the interrupted graft and rollbacks to the state before interrupted
+ graft"""
+ if not graftstate.exists():
+ raise error.Abort(_("no interrupted graft to abort"))
+ statedata = _readgraftstate(repo, graftstate)
+ startnode = statedata.get('startnode')
+ if not startnode:
+ # and old graft state which does not have all the data required to abort
+ # the graft
+ raise error.Abort(_("cannot abort using an old graftstate"))
+ newnodes = statedata.get('newnodes')
+ hg.updaterepo(repo, startnode, True)
+ if newnodes:

It's probably better to not updating to the startnode if we can't strip
grafted revisions.

+ newnodes = [repo[r].rev() for r in newnodes]
+
+ # checking that none of the newnodes turned public or is public
+ immutable = [c for c in newnodes if not repo[c].mutable()]
+ if immutable:
+ repo.ui.warn(_("cannot clean up public changesets %s\n")
+ % ','.join(bytes(repo[r]) for r in immutable),
+ hint=_("see 'hg help phases' for details"))
+
+ # checking that no new nodes are created on top of grafted revs
+ desc = set(repo.changelog.descendants(newnodes))
+ if desc - set(newnodes):
+ repo.ui.warn(_("new changesets detected on destination "
+ "branch, can't strip\n"))
+
+ with repo.wlock(), repo.lock():
+ # stripping the new nodes created
+ strippoints = [c.node() for c in repo.set("roots(%ld)", newnodes)]
+ repair.strip(repo.ui, repo, strippoints, False)
+
+ ui.write(_("graft aborted\nworking directory is now at %s\n")
+ % repo[startnode].hex()[:12])
+ graftstate.delete()
+ return 0

This looks quite similar to rebase.abort(). Can we factor out a common part?
Maybe it's time to add a new module for rebase/graft thingy.

pulkit updated this revision to Diff 9275.Jun 25 2018, 6:05 AM
pulkit added a comment.Jun 25 2018, 6:06 AM
In D3754#58886, @yuja wrote:

This looks quite similar to rebase.abort(). Can we factor out a common part?

We need to cleanup some of the rebase code first to factor out the common part. I will do that.

Maybe it's time to add a new module for rebase/graft thingy.

I agree.

yuja added a comment.Jun 25 2018, 8:14 AM
> This looks quite similar to rebase.abort(). Can we factor out a common part?
We need to cleanup some of the rebase code first to factor out the common part. I will do that.

Awesome, thanks. Should I review the current patch? or are you planning to
revise it?

pulkit added a comment.Jun 25 2018, 8:17 AM
In D3754#59872, @yuja wrote:
> This looks quite similar to rebase.abort(). Can we factor out a common part?
We need to cleanup some of the rebase code first to factor out the common part. I will do that.

Awesome, thanks. Should I review the current patch? or are you planning to
revise it?

I incorporated other reviews except the cleanup one. I haven't yet started the cleanup work, so if you feel that's necessary, you can leave reviewing for now.

yuja added a comment.Jun 25 2018, 11:03 AM

Fixed minor string nits, and queued, thanks.

+ if newnodes:
+ newnodes = [repo[r].rev() for r in newnodes]
+ cleanup = True
+ # checking that none of the newnodes turned public or is public
+ immutable = [c for c in newnodes if not repo[c].mutable()]
+ if immutable:
+ repo.ui.warn(_("cannot clean up public changesets %s\n")
+ % ','.join(bytes(repo[r]) for r in immutable),
+ hint=_("see 'hg help phases' for details"))
+ cleanup = False

It's better to use r/rev, c/ctx, n/node in variable names consistently. Can
you send a followup?

+ ui.write(_("graft aborted\nworking directory is now at %s\n")
+ % startctx.hex()[:12])

s/ui.write/ui.status/ as we do that for graft --stop.

Closed by commit rHG5cdfc20bfd5f: graft: introduce --abort flag to abort interrupted graft (authored by pulkit). · Explain WhyJun 25 2018, 11:05 AM
This revision was automatically updated to reflect the committed changes.
yuja added a comment.Jun 25 2018, 11:07 AM

+ # changeset from which graft operation was started
+ startctx = None
+ if len(newnodes) > 0:
+ startctx = repo[newnodes[0]].p1()

This can be moved under if newnodes:

+ else:
+ startctx = repo['.']
+ # whether to strip or not
+ cleanup = False
+ if newnodes:
+ newnodes = [repo[r].rev() for r in newnodes]

...

+ if not cleanup:
+ # we don't update to the startnode if we can't strip
+ startctx = repo['.']

since startctx is re-initialized here.

+ hg.updaterepo(repo, startctx.node(), True)

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (71 lines)
Mtests/test-completion.t (2 lines)
Mtests/test-graft.t (215 lines)

Diff 9282

mercurial/commands.py

merge as mergemod, merge as mergemod,
obsolete, obsolete,
obsutil, obsutil,
patch, patch,
phases, phases,
pycompat, pycompat,
rcutil, rcutil,
registrar, registrar,
repair,
revsetlang, revsetlang,
rewriteutil, rewriteutil,
scmutil, scmutil,
server, server,
state as statemod, state as statemod,
streamclone, streamclone,
tags as tagsmod, tags as tagsmod,
templatekw, templatekw,
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')), ('', 'stop', False, _('stop interrupted graft')),
('', 'abort', False, _('abort 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,
cont = False cont = False
graftstate = statemod.cmdstate(repo, 'graftstate') graftstate = statemod.cmdstate(repo, 'graftstate')
if opts.get('stop'): if opts.get('stop'):
if opts.get('continue'): if opts.get('continue'):
raise error.Abort(_("cannot use '--continue' and " raise error.Abort(_("cannot use '--continue' and "
"'--stop' together")) "'--stop' together"))
if opts.get('abort'):
raise error.Abort(_("cannot use '--abort' and '--stop' together"))
if any((opts.get('edit'), opts.get('log'), opts.get('user'), if any((opts.get('edit'), opts.get('log'), opts.get('user'),
opts.get('date'), opts.get('currentdate'), opts.get('date'), opts.get('currentdate'),
opts.get('currentuser'), opts.get('rev'))): opts.get('currentuser'), opts.get('rev'))):
raise error.Abort(_("cannot specify any other flag with '--stop'")) raise error.Abort(_("cannot specify any other flag with '--stop'"))
return _stopgraft(ui, repo, graftstate) return _stopgraft(ui, repo, graftstate)
elif opts.get('abort'):
if opts.get('continue'):
raise error.Abort(_("cannot use '--continue' and "
"'--abort' 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 '--abort'"))
return _abortgraft(ui, repo, graftstate)
elif opts.get('continue'): elif 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'):
statedata['newnodes'].append(node) statedata['newnodes'].append(node)
# remove state when we complete successfully # remove state when we complete successfully
if not opts.get('dry_run'): if not opts.get('dry_run'):
graftstate.delete() graftstate.delete()
return 0 return 0
def _abortgraft(ui, repo, graftstate):
"""abort the interrupted graft and rollbacks to the state before interrupted
graft"""
if not graftstate.exists():
raise error.Abort(_("no interrupted graft to abort"))
statedata = _readgraftstate(repo, graftstate)
newnodes = statedata.get('newnodes')
if newnodes is None:
# and old graft state which does not have all the data required to abort
# the graft
raise error.Abort(_("cannot abort using an old graftstate"))
# changeset from which graft operation was started
startctx = None
if len(newnodes) > 0:
startctx = repo[newnodes[0]].p1()
else:
startctx = repo['.']
# whether to strip or not
cleanup = False
if newnodes:
newnodes = [repo[r].rev() for r in newnodes]
cleanup = True
# checking that none of the newnodes turned public or is public
immutable = [c for c in newnodes if not repo[c].mutable()]
if immutable:
repo.ui.warn(_("cannot clean up public changesets %s\n")
% ', '.join(bytes(repo[r]) for r in immutable),
hint=_("see 'hg help phases' for details"))
cleanup = False
# checking that no new nodes are created on top of grafted revs
desc = set(repo.changelog.descendants(newnodes))
if desc - set(newnodes):
repo.ui.warn(_("new changesets detected on destination "
"branch, can't strip\n"))
cleanup = False
if cleanup:
with repo.wlock(), repo.lock():
hg.updaterepo(repo, startctx.node(), True)
# stripping the new nodes created
strippoints = [c.node() for c in repo.set("roots(%ld)",
newnodes)]
repair.strip(repo.ui, repo, strippoints, backup=False)
if not cleanup:
# we don't update to the startnode if we can't strip
startctx = repo['.']
hg.updaterepo(repo, startctx.node(), True)
ui.status(_("graft aborted\n"))
ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
graftstate.delete()
return 0
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}

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, stop, edit, log, force, currentdate, currentuser, date, user, tool, dry-run graft: rev, continue, stop, abort, edit, log, force, currentdate, currentuser, date, user, tool, dry-run
grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, allfiles, user, date, template, include, exclude grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, allfiles, 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

| o 3:9150fe93bec6 added d | o 3:9150fe93bec6 added d
| | | |
| o 2:155349b645be added c | o 2:155349b645be added c
|/ |/
o 1:5f6d8a4bf34a added b o 1:5f6d8a4bf34a added b
| |
o 0:9092f1db7931 added a o 0:9092f1db7931 added a
$ cd ..
Testing the --abort flag for `hg graft` which aborts and rollback to state
before the graft
$ hg init abortgraft
$ cd abortgraft
$ for ch in a b c d; do echo $ch > $ch; hg add $ch; hg ci -Aqm "added "$ch; done;
$ hg up '.^^'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo x > x
$ hg ci -Aqm "added x"
$ hg up '.^'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo foo > c
$ hg ci -Aqm "added foo to c"
$ hg log -GT "{rev}:{node|short} {desc}"
@ 5:36b793615f78 added foo to c
|
| o 4:863a25e1a9ea added x
|/
| o 3:9150fe93bec6 added d
| |
| o 2:155349b645be added c
|/
o 1:5f6d8a4bf34a added b
|
o 0:9092f1db7931 added a
$ hg up 9150fe93bec6
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg graft --abort
abort: no interrupted graft to abort
[255]
when stripping is required
$ hg graft -r 4 -r 5
grafting 4:863a25e1a9ea "added x"
grafting 5:36b793615f78 "added foo to c" (tip)
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')
[255]
$ hg graft --continue --abort
abort: cannot use '--continue' and '--abort' together
[255]
$ hg graft --abort --stop
abort: cannot use '--abort' and '--stop' together
[255]
$ hg graft --abort --currentuser
abort: cannot specify any other flag with '--abort'
[255]
$ hg graft --abort --edit
abort: cannot specify any other flag with '--abort'
[255]
$ hg graft --abort
graft aborted
working directory is now at 9150fe93bec6
$ hg log -GT "{rev}:{node|short} {desc}"
o 5:36b793615f78 added foo to c
|
| o 4:863a25e1a9ea added x
|/
| @ 3:9150fe93bec6 added d
| |
| o 2:155349b645be added c
|/
o 1:5f6d8a4bf34a added b
|
o 0:9092f1db7931 added a
when stripping is not required
$ hg graft -r 5
grafting 5:36b793615f78 "added foo to c" (tip)
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')
[255]
$ hg graft --abort
graft aborted
working directory is now at 9150fe93bec6
$ hg log -GT "{rev}:{node|short} {desc}"
o 5:36b793615f78 added foo to c
|
| o 4:863a25e1a9ea added x
|/
| @ 3:9150fe93bec6 added d
| |
| o 2:155349b645be added c
|/
o 1:5f6d8a4bf34a added b
|
o 0:9092f1db7931 added a
when some of the changesets became public
$ hg graft -r 4 -r 5
grafting 4:863a25e1a9ea "added x"
grafting 5:36b793615f78 "added foo to c" (tip)
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')
[255]
$ hg log -GT "{rev}:{node|short} {desc}"
@ 6:6ec71c037d94 added x
|
| o 5:36b793615f78 added foo to c
| |
| | o 4:863a25e1a9ea added x
| |/
o | 3:9150fe93bec6 added d
| |
o | 2:155349b645be added c
|/
o 1:5f6d8a4bf34a added b
|
o 0:9092f1db7931 added a
$ hg phase -r 6 --public
$ hg graft --abort
cannot clean up public changesets 6ec71c037d94
graft aborted
working directory is now at 6ec71c037d94
when we created new changesets on top of existing one
$ hg up '.^^'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo y > y
$ hg ci -Aqm "added y"
$ echo z > z
$ hg ci -Aqm "added z"
$ hg up 3
1 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ hg log -GT "{rev}:{node|short} {desc}"
o 8:637f9e9bbfd4 added z
|
o 7:123221671fd4 added y
|
| o 6:6ec71c037d94 added x
| |
| | o 5:36b793615f78 added foo to c
| | |
| | | o 4:863a25e1a9ea added x
| | |/
| @ | 3:9150fe93bec6 added d
|/ /
o / 2:155349b645be added c
|/
o 1:5f6d8a4bf34a added b
|
o 0:9092f1db7931 added a
$ hg graft -r 8 -r 7 -r 5
grafting 8:637f9e9bbfd4 "added z" (tip)
grafting 7:123221671fd4 "added y"
grafting 5:36b793615f78 "added foo to c"
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')
[255]
$ cd ..
$ hg init pullrepo
$ cd pullrepo
$ cat >> .hg/hgrc <<EOF
> [phases]
> publish=False
> EOF
$ hg pull ../abortgraft --config phases.publish=False
pulling from ../abortgraft
requesting all changes
adding changesets
adding manifests
adding file changes
added 11 changesets with 9 changes to 8 files (+4 heads)
new changesets 9092f1db7931:6b98ff0062dd
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 9
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo w > w
$ hg ci -Aqm "added w" --config phases.publish=False
$ cd ../abortgraft
$ hg pull ../pullrepo
pulling from ../pullrepo
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 311dfc6cf3bf
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg graft --abort
new changesets detected on destination branch, can't strip
graft aborted
working directory is now at 6b98ff0062dd