Mercurial > hg
changeset 42604:209f2b8a50dc
abort: removed labels argument from abortmerge()
Labels are used to label the code that belongs to `working copy` and `merge rev`
in case of a conflicted state.
No such labelling is required while aborting merge as conflicted parts
are reverted to normal.
Differential Revision: https://phab.mercurial-scm.org/D6638
| author | Taapas Agrawal <taapas2897@gmail.com> |
|---|---|
| date | Thu, 11 Jul 2019 03:08:28 +0530 |
| parents | 3018749a71bb |
| children | 5c36a7e4912a |
| files | mercurial/hg.py |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hg.py Fri Jul 12 23:34:24 2019 -0700 +++ b/mercurial/hg.py Thu Jul 11 03:08:28 2019 +0530 @@ -957,7 +957,7 @@ """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" if abort: - return abortmerge(repo.ui, repo, labels=labels) + return abortmerge(repo.ui, repo) stats = mergemod.update(repo, node, branchmerge=True, force=force, mergeforce=mergeforce, labels=labels) @@ -969,7 +969,7 @@ repo.ui.status(_("(branch merge, don't forget to commit)\n")) return stats.unresolvedcount > 0 -def abortmerge(ui, repo, labels=None): +def abortmerge(ui, repo): ms = mergemod.mergestate.read(repo) if ms.active(): # there were conflicts @@ -980,8 +980,7 @@ repo.ui.status(_("aborting the merge, updating back to" " %s\n") % node[:12]) - stats = mergemod.update(repo, node, branchmerge=False, force=True, - labels=labels) + stats = mergemod.update(repo, node, branchmerge=False, force=True) _showstats(repo, stats) return stats.unresolvedcount > 0