| Submitter | timeless@mozdev.org |
|---|---|
| Date | Jan. 6, 2016, 5:12 a.m. |
| Message ID | <8dc8b965063bfc7d3fb3.1452057157@waste.org> |
| Download | mbox | patch |
| Permalink | /patch/12560/ |
| State | Accepted |
| Headers | show |
Comments
On Tue, Jan 05, 2016 at 11:12:37PM -0600, timeless wrote: > # HG changeset patch > # User timeless <timeless@mozdev.org> > # Date 1452056386 0 > # Wed Jan 06 04:59:46 2016 +0000 > # Node ID 8dc8b965063bfc7d3fb35d4266f1db9fe63b53cd > # Parent ca8dfff2add30ea34a82ab8eb9cc70aeb552d381 > transplant: specify the right file and path for unfinishedstates Patches 2-4 are queued, thanks. > > diff --git a/hgext/transplant.py b/hgext/transplant.py > --- a/hgext/transplant.py > +++ b/hgext/transplant.py > @@ -722,7 +722,7 @@ > revsetpredicate.setup() > templatekw.keywords['transplanted'] = kwtransplanted > cmdutil.unfinishedstates.append( > - ['series', True, False, _('transplant in progress'), > + ['transplant/journal', True, False, _('transplant in progress'), > _("use 'hg transplant --continue' or 'hg update' to abort")]) > > # tell hggettext to extract docstrings from these functions: > diff --git a/tests/test-transplant.t b/tests/test-transplant.t > --- a/tests/test-transplant.t > +++ b/tests/test-transplant.t > @@ -418,6 +418,10 @@ > patch failed to apply > abort: fix up the working directory and run hg transplant --continue > [255] > + $ hg transplant 1:3 > + abort: transplant in progress > + (use 'hg transplant --continue' or 'hg update' to abort) > + [255] > $ echo fixed > baz > $ hg transplant --continue > 9d6d6b5a8275 transplanted as d80c49962290 > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -722,7 +722,7 @@ revsetpredicate.setup() templatekw.keywords['transplanted'] = kwtransplanted cmdutil.unfinishedstates.append( - ['series', True, False, _('transplant in progress'), + ['transplant/journal', True, False, _('transplant in progress'), _("use 'hg transplant --continue' or 'hg update' to abort")]) # tell hggettext to extract docstrings from these functions: diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -418,6 +418,10 @@ patch failed to apply abort: fix up the working directory and run hg transplant --continue [255] + $ hg transplant 1:3 + abort: transplant in progress + (use 'hg transplant --continue' or 'hg update' to abort) + [255] $ echo fixed > baz $ hg transplant --continue 9d6d6b5a8275 transplanted as d80c49962290