Mercurial > hg
comparison mercurial/commands.py @ 44398:ddbc296a1f48
merge: drop redundant mergeforce argument from hg.merge()
The only caller that passed a value for either `force` or `mergeforce`
passed the same value for both, so let's simplify the interface by
accepting only `force`.
Differential Revision: https://phab.mercurial-scm.org/D8167
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 26 Feb 2020 11:00:50 -0800 |
| parents | 9dab3fa64325 |
| children | 1e508097f570 |
comparison
equal
deleted
inserted
replaced
| 44397:0f60687b2324 | 44398:ddbc296a1f48 |
|---|---|
| 4907 # ui.forcemerge is an internal variable, do not document | 4907 # ui.forcemerge is an internal variable, do not document |
| 4908 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} | 4908 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
| 4909 with ui.configoverride(overrides, b'merge'): | 4909 with ui.configoverride(overrides, b'merge'): |
| 4910 force = opts.get(b'force') | 4910 force = opts.get(b'force') |
| 4911 labels = [b'working copy', b'merge rev'] | 4911 labels = [b'working copy', b'merge rev'] |
| 4912 return hg.merge( | 4912 return hg.merge(repo, node, force=force, labels=labels) |
| 4913 repo, node, force=force, mergeforce=force, labels=labels | |
| 4914 ) | |
| 4915 | 4913 |
| 4916 | 4914 |
| 4917 statemod.addunfinished( | 4915 statemod.addunfinished( |
| 4918 b'merge', | 4916 b'merge', |
| 4919 fname=None, | 4917 fname=None, |