# HG changeset patch # User Matt Mackall # Date 2013-07-25 04:51:44 # Node ID 7c0bb2b75aa849dc2a581ffca45ad31d872769c0 # Parent 11664641fbad2194698ed5e9f82f358ebdb1badd transplant: add checkunfinished (issue3955) Nobody loves transplant anymore, but it was the first command to have a --continue flag. diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -605,6 +605,7 @@ def transplant(ui, repo, *revs, **opts): 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 kwtransplanted(repo, ctx, **args): 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]