This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6696

abort: added support for transplant
AbandonedPublic

Authored by taapas1128 on Jul 26 2019, 6:51 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This adds support of transplant--abort to
hg abort. A seperate aborttransplant function is
created for that.

Results are shown in tests.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jul 26 2019, 6:51 AM
pulkit added a subscriber: pulkit.Aug 7 2019, 5:27 PM
pulkit added inline comments.
hgext/transplant.py
770

return tp.abort(..) instead.

taapas1128 marked an inline comment as done.Aug 8 2019, 12:11 PM
taapas1128 updated this revision to Diff 16160.
taapas1128 abandoned this revision.Aug 17 2019, 6:12 AM

Revision Contents
Changeset List

PathPackages
Mhgext/transplant.py (9 lines)
Mtests/test-transplant.t (16 lines)

Diff 16160

hgext/transplant.py

def continuetransplant(ui, repo): def continuetransplant(ui, repo):
"""logic to resume an interrupted transplant using """logic to resume an interrupted transplant using
'hg continue'""" 'hg continue'"""
with repo.wlock(): with repo.wlock():
tp = transplanter(ui, repo, {}) tp = transplanter(ui, repo, {})
return tp.resume(repo, repo, {}) return tp.resume(repo, repo, {})
def aborttransplant(ui, repo):
"""logic to abort a transplnat in progress using
'hg abort'"""
with repo.wlock():
tp = transplanter(ui, repo, {})
return tp.abort(ui, repo)
pulkitUnsubmitted
Done

return tp.abort(..) instead.

pulkit: `return tp.abort(..)` instead.
revsetpredicate = registrar.revsetpredicate() revsetpredicate = registrar.revsetpredicate()
@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)
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=continuetransplant, continuefunc=continuetransplant, abortfunc=aborttransplant,
) )
# 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 abortflag continueflag
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> transplant= > transplant=
> graphlog= > graphlog=
> EOF > EOF
#if abortflag
$ cat >> $HGRCPATH <<EOF
> [alias]
> abort = transplant --abort
> EOF
#endif
#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
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]
$ hg transplant --abort $ hg abort
transplant aborted transplant aborted
working directory is now at e8643552fde5 working directory is now at e8643552fde5
Repo log after abort Repo log after abort
$ hg glog $ hg glog
@ changeset: 4:e8643552fde5 @ changeset: 4:e8643552fde5
| tag: tip | tag: tip
| parent: 0:493149fa1541 | parent: 0:493149fa1541
| user: test | user: test
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 --abort $ hg abort
abort: no transplant to abort abort: no transplant to abort (abortflag !)
abort: no operation in progress (no-abortflag !)
[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