equal
deleted
inserted
replaced
33 registrar, |
33 registrar, |
34 revlog, |
34 revlog, |
35 revset, |
35 revset, |
36 scmutil, |
36 scmutil, |
37 smartset, |
37 smartset, |
|
38 state as statemod, |
38 util, |
39 util, |
39 vfs as vfsmod, |
40 vfs as vfsmod, |
40 ) |
41 ) |
41 from mercurial.utils import ( |
42 from mercurial.utils import ( |
42 procutil, |
43 procutil, |
755 ctx = context.resource(mapping, 'ctx') |
756 ctx = context.resource(mapping, 'ctx') |
756 n = ctx.extra().get('transplant_source') |
757 n = ctx.extra().get('transplant_source') |
757 return n and nodemod.hex(n) or '' |
758 return n and nodemod.hex(n) or '' |
758 |
759 |
759 def extsetup(ui): |
760 def extsetup(ui): |
760 cmdutil.unfinishedstates.append( |
761 statemod.unfinishedstates.append( |
761 ['transplant/journal', True, False, _('transplant in progress'), |
762 ['transplant/journal', True, False, _('transplant in progress'), |
762 _("use 'hg transplant --continue' or 'hg update' to abort")]) |
763 _("use 'hg transplant --continue' or 'hg update' to abort")]) |
763 |
764 |
764 # tell hggettext to extract docstrings from these functions: |
765 # tell hggettext to extract docstrings from these functions: |
765 i18nfunctions = [revsettransplanted, kwtransplanted] |
766 i18nfunctions = [revsettransplanted, kwtransplanted] |