Mercurial > hg
comparison hgext/transplant.py @ 19496:607191a45f8c stable
checkunfinished: accommodate histedit quirk
Turns out histedit actually intends for commits (but not other
operations like update) to be possible during its operation.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 25 Jul 2013 02:17:52 -0500 |
parents | 7c0bb2b75aa8 |
children | d51c4d85ec23 |
comparison
equal
deleted
inserted
replaced
19495:9aee3d014394 | 19496:607191a45f8c |
---|---|
683 | 683 |
684 def extsetup(ui): | 684 def extsetup(ui): |
685 revset.symbols['transplanted'] = revsettransplanted | 685 revset.symbols['transplanted'] = revsettransplanted |
686 templatekw.keywords['transplanted'] = kwtransplanted | 686 templatekw.keywords['transplanted'] = kwtransplanted |
687 cmdutil.unfinishedstates.append( | 687 cmdutil.unfinishedstates.append( |
688 ['series', True, _('transplant in progress'), | 688 ['series', True, False, _('transplant in progress'), |
689 _("use 'hg transplant --continue' or 'hg update' to abort")]) | 689 _("use 'hg transplant --continue' or 'hg update' to abort")]) |
690 | 690 |
691 # tell hggettext to extract docstrings from these functions: | 691 # tell hggettext to extract docstrings from these functions: |
692 i18nfunctions = [revsettransplanted, kwtransplanted] | 692 i18nfunctions = [revsettransplanted, kwtransplanted] |