This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6689

continue: added support for transplant
ClosedPublic

Authored by taapas1128 on Jul 24 2019, 9:04 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0a4303c77637: continue: added support for transplant
Summary

This creates a seperate function continuetransplant()
containing logic for resuming transplant from interrupted
state.
continuetransplant() is then registered as continuefunc
for state detection API.

Results are shown in tests.

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 24 2019, 9:04 AM
pulkit added a subscriber: pulkit.Aug 7 2019, 5:57 PM
pulkit added inline comments.
hgext/transplant.py
743

I don't see transplanter modifying opts. So we can directly pass empty dict in both of the above function.

744

return tp.resume(..) will be better here

taapas1128 updated this revision to Diff 16158.Aug 8 2019, 12:11 PM
pulkit added inline comments.Aug 8 2019, 12:29 PM
hgext/transplant.py
737

let's name this function continue only as it's in transplant.py and a continue implies that we are continuing transplant.

taapas1128 marked an inline comment as done.Aug 8 2019, 1:33 PM
taapas1128 updated this revision to Diff 16161.
pulkit accepted this revision.Aug 8 2019, 4:33 PM
This revision is now accepted and ready to land.Aug 8 2019, 4:33 PM
taapas1128 added a commit: rHG0a4303c77637: continue: added support for transplant.Aug 9 2019, 3:15 PM
Closed by commit rHG0a4303c77637: continue: added support for transplant (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/transplant.py (8 lines)
Mtests/test-transplant.t (17 lines)

Diff 16169

hgext/transplant.py

for r in merges: for r in merges:
revmap[source.changelog.rev(r)] = r revmap[source.changelog.rev(r)] = r
tp.apply(repo, source, revmap, merges, opts) tp.apply(repo, source, revmap, merges, opts)
finally: finally:
if cleanupfn: if cleanupfn:
cleanupfn() cleanupfn()
def continuecmd(ui, repo):
pulkitUnsubmitted
Done

let's name this function continue only as it's in transplant.py and a continue implies that we are continuing transplant.

pulkit: let's name this function `continue` only as it's in transplant.py and a continue implies that…
"""logic to resume an interrupted transplant using
'hg continue'"""
with repo.wlock():
tp = transplanter(ui, repo, {})
return tp.resume(repo, repo, {})
pulkitUnsubmitted
Not Done

I don't see transplanter modifying opts. So we can directly pass empty dict in both of the above function.

pulkit: I don't see `transplanter` modifying opts. So we can directly pass empty dict in both of the…
revsetpredicate = registrar.revsetpredicate() revsetpredicate = registrar.revsetpredicate()
pulkitUnsubmitted
Not Done

return tp.resume(..) will be better here

pulkit: `return tp.resume(..)` will be better here
@revsetpredicate('transplanted([set])') @revsetpredicate('transplanted([set])')
def revsettransplanted(repo, subset, x): def revsettransplanted(repo, subset, x):
"""Transplanted changesets in set, or all transplanted changesets. """Transplanted changesets in set, or all transplanted changesets.
""" """
if x: if x:
s = revset.getset(repo, subset, x) s = revset.getset(repo, subset, x)
else: else:
changeset if any.""" changeset if any."""
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,
statushint=_('To continue: hg transplant --continue\n' statushint=_('To continue: hg transplant --continue\n'
'To abort: hg update'), 'To abort: hg update'),
cmdhint=_("use 'hg transplant --continue' or 'hg update' to abort") cmdhint=_("use 'hg transplant --continue' or 'hg update' to abort")
) )
# 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
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> transplant= > transplant=
> EOF > EOF
#if continueflag
$ cat >> $HGRCPATH <<EOF
> [alias]
> continue = transplant --continue
> EOF
#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]
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 transplant --continue $ hg continue
abort: no transplant to continue abort: no transplant to continue (continueflag !)
abort: no operation in progress (no-continueflag !)
[255] [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
? 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 abort: hg update
$ echo fixed > baz $ echo fixed > baz
$ hg transplant --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
applying 645035761929 applying 645035761929
file b already exists file b already exists
1 out of 1 hunks FAILED -- saving rejects to file b.rej 1 out of 1 hunks FAILED -- saving rejects to file b.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 status $ hg status
? b.rej ? b.rej
$ hg transplant --continue $ hg continue
645035761929 skipped due to empty diff 645035761929 skipped due to empty diff
$ cd .. $ cd ..
Explicitly kill daemons to let the test exit on Windows Explicitly kill daemons to let the test exit on Windows
$ killdaemons.py $ killdaemons.py