Mercurial > hg
comparison hgext/histedit.py @ 44212:cb8b67016110
graft: default `base` argument to common case of `ctx.p1()`
I also updated the callers that wanted that, partly to simplify and
partly to show that it works.
Differential Revision: https://phab.mercurial-scm.org/D8027
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 28 Jan 2020 14:53:23 -0800 |
parents | 801b8d314791 |
children | f546d2170b0f |
comparison
equal
deleted
inserted
replaced
44211:fc7175df6359 | 44212:cb8b67016110 |
---|---|
647 try: | 647 try: |
648 # ui.forcemerge is an internal variable, do not document | 648 # ui.forcemerge is an internal variable, do not document |
649 repo.ui.setconfig( | 649 repo.ui.setconfig( |
650 b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit' | 650 b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit' |
651 ) | 651 ) |
652 stats = mergemod.graft(repo, ctx, ctx.p1(), [b'local', b'histedit']) | 652 stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit']) |
653 finally: | 653 finally: |
654 repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit') | 654 repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit') |
655 return stats | 655 return stats |
656 | 656 |
657 | 657 |