##// END OF EJS Templates
transplant: add checkunfinished (issue3955)...
Matt Mackall -
r19480:7c0bb2b7 stable
parent child Browse files
Show More
@@ -605,6 +605,7 b' def transplant(ui, repo, *revs, **opts):'
605 if opts.get('edit'):
605 if opts.get('edit'):
606 tp.editor = cmdutil.commitforceeditor
606 tp.editor = cmdutil.commitforceeditor
607
607
608 cmdutil.checkunfinished(repo)
608 p1, p2 = repo.dirstate.parents()
609 p1, p2 = repo.dirstate.parents()
609 if len(repo) > 0 and p1 == revlog.nullid:
610 if len(repo) > 0 and p1 == revlog.nullid:
610 raise util.Abort(_('no revision checked out'))
611 raise util.Abort(_('no revision checked out'))
@@ -683,6 +684,9 b' def kwtransplanted(repo, ctx, **args):'
683 def extsetup(ui):
684 def extsetup(ui):
684 revset.symbols['transplanted'] = revsettransplanted
685 revset.symbols['transplanted'] = revsettransplanted
685 templatekw.keywords['transplanted'] = kwtransplanted
686 templatekw.keywords['transplanted'] = kwtransplanted
687 cmdutil.unfinishedstates.append(
688 ['series', True, _('transplant in progress'),
689 _("use 'hg transplant --continue' or 'hg update' to abort")])
686
690
687 # tell hggettext to extract docstrings from these functions:
691 # tell hggettext to extract docstrings from these functions:
688 i18nfunctions = [revsettransplanted, kwtransplanted]
692 i18nfunctions = [revsettransplanted, kwtransplanted]
General Comments 0
You need to be logged in to leave comments. Login now