Mercurial > hg
comparison mercurial/shelve.py @ 44270:f546d2170b0f
merge: introduce a clean_update() for that use-case
I find it hard to understand what value to pass for all the arguments
to `merge.update()`. I would like to introduce functions that are more
specific to each use-case. We already have `graft()`. This patch
introduces a `clean_update()` and uses it in some places to show that
it works.
Differential Revision: https://phab.mercurial-scm.org/D7902
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 15 Jan 2020 15:30:25 -0800 |
parents | cb8b67016110 |
children | f5c006621f07 |
comparison
equal
deleted
inserted
replaced
44269:48a1a974a92c | 44270:f546d2170b0f |
---|---|
743 """subcommand that abort an in-progress unshelve""" | 743 """subcommand that abort an in-progress unshelve""" |
744 with repo.lock(): | 744 with repo.lock(): |
745 try: | 745 try: |
746 checkparents(repo, state) | 746 checkparents(repo, state) |
747 | 747 |
748 merge.update(repo, state.pendingctx, branchmerge=False, force=True) | 748 merge.clean_update(state.pendingctx) |
749 if state.activebookmark and state.activebookmark in repo._bookmarks: | 749 if state.activebookmark and state.activebookmark in repo._bookmarks: |
750 bookmarks.activate(repo, state.activebookmark) | 750 bookmarks.activate(repo, state.activebookmark) |
751 mergefiles(ui, repo, state.wctx, state.pendingctx) | 751 mergefiles(ui, repo, state.wctx, state.pendingctx) |
752 if not phases.supportinternal(repo): | 752 if not phases.supportinternal(repo): |
753 repair.strip( | 753 repair.strip( |