This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6695

transplant: added support for --stop flag
ClosedPublic

Authored by taapas1128 on Jul 25 2019, 4:16 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGac6121a24f27: transplant: added support for --stop flag
rHGf6a4db4b40ed: transplant: added support for --stop flag
rHG4d10aada6c3b: transplant: added support for --stop flag
Summary

This adds fuctionality for --stop flag to transplant.
A new method stop is added to transplanter class
containing logic to abort transplant.

Tests are updated as shown.

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

taapas1128 created this revision.Jul 25 2019, 4:16 PM
taapas1128 updated this revision to Diff 16068.Jul 26 2019, 6:02 AM
pulkit added a subscriber: pulkit.Aug 7 2019, 5:24 PM
pulkit added inline comments.
hgext/transplant.py
415

We already have self.unlog doing the same here.

420

the , after ui is misplaced a bit

699

return tp.abort(...) here

792–793

IIUC, we don't need to manually pass statushint and cmdhint now.

tests/test-transplant.t
466

A better candidate here will be to show hg status -v as that will show whether there is an unfinished transplant or not.

taapas1128 marked 4 inline comments as done.Aug 8 2019, 12:11 PM
taapas1128 updated this revision to Diff 16159.
pulkit added inline comments.Aug 8 2019, 12:23 PM
hgext/transplant.py
417

canresume above can be used for doing this check.

taapas1128 updated this revision to Diff 16162.Aug 8 2019, 1:34 PM
pulkit added inline comments.Aug 8 2019, 4:37 PM
tests/test-transplant.t
466

This one is not done.

pulkit added a comment.Aug 8 2019, 4:40 PM

Sorry for missing this earlier, but what happens when we are transplanting mutliple revisions and we have conflicts in a revision after the first one?

pulkit added a comment.Aug 15 2019, 11:32 AM

Let's rename this to transplant --stop instead.

taapas1128 marked an inline comment as done.Aug 15 2019, 12:27 PM
taapas1128 retitled this revision from transplant: added support for --abort flag to transplant: added support for --stop flag.
taapas1128 edited the summary of this revision. (Show Details)
taapas1128 updated this revision to Diff 16214.
pulkit accepted this revision.Aug 16 2019, 5:54 AM
This revision is now accepted and ready to land.Aug 16 2019, 5:54 AM
taapas1128 added a commit: rHG4d10aada6c3b: transplant: added support for --stop flag.Aug 16 2019, 6:55 AM
Closed by commit rHG4d10aada6c3b: transplant: added support for --stop flag (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/transplant.py (25 lines)
Mtests/test-transplant.t (89 lines)

Diff 16223

hgext/transplant.py

self.unlog() self.unlog()
return n, node return n, node
finally: finally:
# TODO: get rid of this meaningless try/finally enclosing. # TODO: get rid of this meaningless try/finally enclosing.
# this is kept only to reduce changes in a patch. # this is kept only to reduce changes in a patch.
pass pass
def stop(self, ui, repo):
pulkitUnsubmitted
Done

We already have self.unlog doing the same here.

pulkit: We already have `self.unlog` doing the same here.
"""logic to stop an interrupted transplant"""
if self.canresume():
pulkitUnsubmitted
Done

canresume above can be used for doing this check.

pulkit: `canresume` above can be used for doing this check.
startctx = repo['.']
hg.updaterepo(repo, startctx.node(), overwrite=True)
ui.status(_("stopped the interrupted transplant\n"))
pulkitUnsubmitted
Done

the , after ui is misplaced a bit

pulkit: the `,` after ui is misplaced a bit
ui.status(_("working directory is now at %s\n") %
startctx.hex()[:12])
self.unlog()
return 0
def readseries(self): def readseries(self):
nodes = [] nodes = []
merges = [] merges = []
cur = nodes cur = nodes
for line in self.opener.read('series').splitlines(): for line in self.opener.read('series').splitlines():
if line.startswith('# Merges'): if line.startswith('# Merges'):
cur = merges cur = merges
continue continue
('b', 'branch', [], _('use this source changeset as head'), _('REV')), ('b', 'branch', [], _('use this source changeset as head'), _('REV')),
('a', 'all', None, _('pull all changesets up to the --branch revisions')), ('a', 'all', None, _('pull all changesets up to the --branch revisions')),
('p', 'prune', [], _('skip over REV'), _('REV')), ('p', 'prune', [], _('skip over REV'), _('REV')),
('m', 'merge', [], _('merge at REV'), _('REV')), ('m', 'merge', [], _('merge at REV'), _('REV')),
('', 'parent', '', ('', 'parent', '',
_('parent to choose when transplanting merge'), _('REV')), _('parent to choose when transplanting merge'), _('REV')),
('e', 'edit', False, _('invoke editor on commit messages')), ('e', 'edit', False, _('invoke editor on commit messages')),
('', 'log', None, _('append transplant info to log message')), ('', 'log', None, _('append transplant info to log message')),
('', 'stop', False, _('stop interrupted transplant')),
('c', 'continue', None, _('continue last transplant session ' ('c', 'continue', None, _('continue last transplant session '
'after fixing conflicts')), 'after fixing conflicts')),
('', 'filter', '', ('', 'filter', '',
_('filter changesets through command'), _('CMD'))], _('filter changesets through command'), _('CMD'))],
_('hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] ' _('hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] '
'[-m REV] [REV]...'), '[-m REV] [REV]...'),
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
def transplant(ui, repo, *revs, **opts): def transplant(ui, repo, *revs, **opts):
yield node yield node
def checkopts(opts, revs): def checkopts(opts, revs):
if opts.get('continue'): if opts.get('continue'):
if opts.get('branch') or opts.get('all') or opts.get('merge'): if opts.get('branch') or opts.get('all') or opts.get('merge'):
raise error.Abort(_('--continue is incompatible with ' raise error.Abort(_('--continue is incompatible with '
'--branch, --all and --merge')) '--branch, --all and --merge'))
return return
if opts.get('stop'):
if opts.get('branch') or opts.get('all') or opts.get('merge'):
raise error.Abort(_('--stop is incompatible with '
'--branch, --all and --merge'))
return
if not (opts.get('source') or revs or if not (opts.get('source') or revs or
opts.get('merge') or opts.get('branch')): opts.get('merge') or opts.get('branch')):
raise error.Abort(_('no source URL, branch revision, or revision ' raise error.Abort(_('no source URL, branch revision, or revision '
'list provided')) 'list provided'))
if opts.get('all'): if opts.get('all'):
if not opts.get('branch'): if not opts.get('branch'):
raise error.Abort(_('--all requires a branch revision')) raise error.Abort(_('--all requires a branch revision'))
if revs: if revs:
p1 = repo.dirstate.p1() p1 = repo.dirstate.p1()
if len(repo) > 0 and p1 == revlog.nullid: if len(repo) > 0 and p1 == revlog.nullid:
raise error.Abort(_('no revision checked out')) raise error.Abort(_('no revision checked out'))
if opts.get('continue'): if opts.get('continue'):
if not tp.canresume(): if not tp.canresume():
raise error.Abort(_('no transplant to continue')) raise error.Abort(_('no transplant to continue'))
else: else:
if opts.get('stop'):
if not tp.canresume():
raise error.Abort(_('no interrupted transplant found'))
return tp.stop(ui, repo)
pulkitUnsubmitted
Done

return tp.abort(...) here

pulkit: `return tp.abort(...)` here
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
sourcerepo = opts.get('source') sourcerepo = opts.get('source')
if sourcerepo: if sourcerepo:
peer = hg.peer(repo, opts, ui.expandpath(sourcerepo)) peer = hg.peer(repo, opts, ui.expandpath(sourcerepo))
heads = pycompat.maplist(peer.lookup, opts.get('branch', ())) heads = pycompat.maplist(peer.lookup, opts.get('branch', ()))
target = set(heads) target = set(heads)
ctx = context.resource(mapping, 'ctx') ctx = context.resource(mapping, 'ctx')
n = ctx.extra().get('transplant_source') n = ctx.extra().get('transplant_source')
return n and nodemod.hex(n) or '' return n and nodemod.hex(n) or ''
def extsetup(ui): def extsetup(ui):
statemod.addunfinished ( statemod.addunfinished (
'transplant', fname='transplant/journal', clearable=True, 'transplant', fname='transplant/journal', clearable=True,
continuefunc=continuecmd, continuefunc=continuecmd,
statushint=_('To continue: hg transplant --continue\n' statushint=_('To continue: hg transplant --continue\n'
'To abort: hg update'), 'To stop: hg transplant --stop'),
pulkitUnsubmitted
Done

IIUC, we don't need to manually pass statushint and cmdhint now.

pulkit: IIUC, we don't need to manually pass statushint and cmdhint now.
cmdhint=_("use 'hg transplant --continue' or 'hg update' to abort") cmdhint=_("use 'hg transplant --continue' or 'hg transplant --stop'")
) )
# tell hggettext to extract docstrings from these functions: # tell hggettext to extract docstrings from these functions:
i18nfunctions = [revsettransplanted, kwtransplanted] i18nfunctions = [revsettransplanted, kwtransplanted]

tests/test-transplant.t

#testcases commandmode continueflag #testcases commandmode continueflag
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> transplant= > transplant=
> graphlog=
> EOF > EOF
#if continueflag #if continueflag
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [alias] > [alias]
> continue = transplant --continue > continue = transplant --continue
> EOF > EOF
#endif #endif
$ hg init t $ hg init t
$ cd t $ cd t
$ hg transplant $ hg transplant
abort: no source URL, branch revision, or revision list provided abort: no source URL, branch revision, or revision list provided
[255] [255]
$ hg transplant --continue --all $ hg transplant --continue --all
abort: --continue is incompatible with --branch, --all and --merge abort: --continue is incompatible with --branch, --all and --merge
[255] [255]
$ hg transplant --stop --all
abort: --stop is incompatible with --branch, --all and --merge
[255]
$ hg transplant --all tip $ hg transplant --all tip
abort: --all requires a branch revision abort: --all requires a branch revision
[255] [255]
$ hg transplant --all --branch default tip $ hg transplant --all --branch default tip
abort: --all is incompatible with a revision list abort: --all is incompatible with a revision list
[255] [255]
$ echo r1 > r1 $ echo r1 > r1
$ hg ci -Amr1 -d'0 0' $ hg ci -Amr1 -d'0 0'
revision different from one run to another) revision different from one run to another)
$ hg pull -q http://localhost:$HGPORT/ $ hg pull -q http://localhost:$HGPORT/
$ hg transplant -s http://localhost:$HGPORT/ 8d9279348abb 722f4667af76 $ hg transplant -s http://localhost:$HGPORT/ 8d9279348abb 722f4667af76
skipping already applied revision 2:8d9279348abb skipping already applied revision 2:8d9279348abb
applying 722f4667af76 applying 722f4667af76
722f4667af76 transplanted to 76e321915884 722f4667af76 transplanted to 76e321915884
transplant --continue
transplant --continue and --stop behaviour
$ hg init ../tc $ hg init ../tc
$ cd ../tc $ cd ../tc
$ cat <<EOF > foo $ cat <<EOF > foo
> foo > foo
> bar > bar
> baz > baz
> EOF > EOF
adding bar adding bar
$ echo bar2 >> bar $ echo bar2 >> bar
$ hg ci -mbar2 $ hg ci -mbar2
$ hg up 0 $ hg up 0
3 files updated, 0 files merged, 2 files removed, 0 files unresolved 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo foobar > foo $ echo foobar > foo
$ hg ci -mfoobar $ hg ci -mfoobar
created new head created new head
Repo log before transplant
$ hg glog
@ changeset: 4:e8643552fde5
| tag: tip
| parent: 0:493149fa1541
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: foobar
|
| o changeset: 3:1dab759070cf
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: bar2
| |
| o changeset: 2:9d6d6b5a8275
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: bar
| |
| o changeset: 1:46ae92138f3c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: foo2
|
o changeset: 0:493149fa1541
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo
$ hg transplant 1:3
applying 46ae92138f3c
patching file foo
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file foo.rej
patch failed to apply
abort: fix up the working directory and run hg transplant --continue
[255]
$ hg transplant --stop
stopped the interrupted transplant
working directory is now at e8643552fde5
Repo log after abort
pulkitUnsubmitted
Not Done

A better candidate here will be to show hg status -v as that will show whether there is an unfinished transplant or not.

pulkit: A better candidate here will be to show `hg status -v` as that will show whether there is an…
pulkitUnsubmitted
Not Done

This one is not done.

pulkit: This one is not done.
$ hg glog
@ changeset: 4:e8643552fde5
| tag: tip
| parent: 0:493149fa1541
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: foobar
|
| o changeset: 3:1dab759070cf
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: bar2
| |
| o changeset: 2:9d6d6b5a8275
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: bar
| |
| o changeset: 1:46ae92138f3c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: foo2
|
o changeset: 0:493149fa1541
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo
$ hg transplant 1:3 $ hg transplant 1:3
applying 46ae92138f3c applying 46ae92138f3c
file added already exists
1 out of 1 hunks FAILED -- saving rejects to file added.rej
patching file foo patching file foo
Hunk #1 FAILED at 0 Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file foo.rej 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
patch failed to apply patch failed to apply
abort: fix up the working directory and run hg transplant --continue abort: fix up the working directory and run hg transplant --continue
[255] [255]
transplant -c shouldn't use an old changeset transplant -c shouldn't use an old changeset
$ hg up -C $ hg up -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "e8643552fde5: foobar" updated to "e8643552fde5: foobar"
1 other heads for branch "default" 1 other heads for branch "default"
$ rm added $ rm added
$ hg continue $ hg continue
abort: no transplant to continue (continueflag !) abort: no transplant to continue (continueflag !)
abort: no operation in progress (no-continueflag !) abort: no operation in progress (no-continueflag !)
[255] [255]
$ hg transplant --stop
abort: no interrupted transplant found
[255]
$ hg transplant 1 $ hg transplant 1
applying 46ae92138f3c applying 46ae92138f3c
patching file foo patching file foo
Hunk #1 FAILED at 0 Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file foo.rej 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
patch failed to apply patch failed to apply
abort: fix up the working directory and run hg transplant --continue abort: fix up the working directory and run hg transplant --continue
[255] [255]
patching file baz patching file baz
Hunk #1 FAILED at 0 Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file baz.rej 1 out of 1 hunks FAILED -- saving rejects to file baz.rej
patch failed to apply patch failed to apply
abort: fix up the working directory and run hg transplant --continue abort: fix up the working directory and run hg transplant --continue
[255] [255]
$ hg transplant 1:3 $ hg transplant 1:3
abort: transplant in progress abort: transplant in progress
(use 'hg transplant --continue' or 'hg update' to abort) (use 'hg transplant --continue' or 'hg transplant --stop')
[255] [255]
$ hg status -v $ hg status -v
A bar A bar
? added.rej
? baz.rej ? baz.rej
? foo.rej ? foo.rej
# The repository is in an unfinished *transplant* state. # The repository is in an unfinished *transplant* state.
# To continue: hg transplant --continue # To continue: hg transplant --continue
# To abort: hg update # To stop: hg transplant --stop
$ echo fixed > baz $ echo fixed > baz
$ hg continue $ hg continue
9d6d6b5a8275 transplanted as d80c49962290 9d6d6b5a8275 transplanted as d80c49962290
applying 1dab759070cf applying 1dab759070cf
1dab759070cf transplanted to aa0ffe6bd5ae 1dab759070cf transplanted to aa0ffe6bd5ae
$ cd .. $ cd ..
Issue1111: Test transplant --merge Issue1111: Test transplant --merge
$ hg init t1111 $ hg init t1111
$ cd t1111 $ cd t1111
$ echo a > a $ echo a > a
$ hg ci -Am adda $ hg ci -Am adda