Mercurial > public > mercurial-scm > hg
diff hgext/transplant.py @ 19480:7c0bb2b75aa8 stable
transplant: add checkunfinished (issue3955)
Nobody loves transplant anymore, but it was the first command to have
a --continue flag.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 24 Jul 2013 23:51:44 -0500 |
| parents | 0fc41f88f148 |
| children | 607191a45f8c |
line wrap: on
line diff
--- a/hgext/transplant.py Wed Jul 24 23:51:44 2013 -0500 +++ b/hgext/transplant.py Wed Jul 24 23:51:44 2013 -0500 @@ -605,6 +605,7 @@ if opts.get('edit'): tp.editor = cmdutil.commitforceeditor + cmdutil.checkunfinished(repo) p1, p2 = repo.dirstate.parents() if len(repo) > 0 and p1 == revlog.nullid: raise util.Abort(_('no revision checked out')) @@ -683,6 +684,9 @@ def extsetup(ui): revset.symbols['transplanted'] = revsettransplanted templatekw.keywords['transplanted'] = kwtransplanted + cmdutil.unfinishedstates.append( + ['series', True, _('transplant in progress'), + _("use 'hg transplant --continue' or 'hg update' to abort")]) # tell hggettext to extract docstrings from these functions: i18nfunctions = [revsettransplanted, kwtransplanted]