equal
deleted
inserted
replaced
691 tp.apply(repo, source, revmap, merges, opts) |
691 tp.apply(repo, source, revmap, merges, opts) |
692 finally: |
692 finally: |
693 if cleanupfn: |
693 if cleanupfn: |
694 cleanupfn() |
694 cleanupfn() |
695 |
695 |
|
696 revsetpredicate = revset.extpredicate() |
|
697 |
|
698 @revsetpredicate('transplanted([set])') |
696 def revsettransplanted(repo, subset, x): |
699 def revsettransplanted(repo, subset, x): |
697 """``transplanted([set])`` |
700 """Transplanted changesets in set, or all transplanted changesets. |
698 Transplanted changesets in set, or all transplanted changesets. |
|
699 """ |
701 """ |
700 if x: |
702 if x: |
701 s = revset.getset(repo, subset, x) |
703 s = revset.getset(repo, subset, x) |
702 else: |
704 else: |
703 s = subset |
705 s = subset |
709 changeset if any.""" |
711 changeset if any.""" |
710 n = ctx.extra().get('transplant_source') |
712 n = ctx.extra().get('transplant_source') |
711 return n and revlog.hex(n) or '' |
713 return n and revlog.hex(n) or '' |
712 |
714 |
713 def extsetup(ui): |
715 def extsetup(ui): |
714 revset.symbols['transplanted'] = revsettransplanted |
716 revsetpredicate.setup() |
715 templatekw.keywords['transplanted'] = kwtransplanted |
717 templatekw.keywords['transplanted'] = kwtransplanted |
716 cmdutil.unfinishedstates.append( |
718 cmdutil.unfinishedstates.append( |
717 ['series', True, False, _('transplant in progress'), |
719 ['series', True, False, _('transplant in progress'), |
718 _("use 'hg transplant --continue' or 'hg update' to abort")]) |
720 _("use 'hg transplant --continue' or 'hg update' to abort")]) |
719 |
721 |