| pulkit |
| hg-reviewers |
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.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (4 lines) | |||
| M | mercurial/hg.py (4 lines) | |||
| M | relnotes/next (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| displayer.close() | displayer.close() | ||||
| return 0 | return 0 | ||||
| # ui.forcemerge is an internal variable, do not document | # ui.forcemerge is an internal variable, do not document | ||||
| overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} | overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} | ||||
| with ui.configoverride(overrides, b'merge'): | with ui.configoverride(overrides, b'merge'): | ||||
| force = opts.get(b'force') | force = opts.get(b'force') | ||||
| labels = [b'working copy', b'merge rev'] | labels = [b'working copy', b'merge rev'] | ||||
| return hg.merge( | return hg.merge(repo, node, force=force, labels=labels) | ||||
| repo, node, force=force, mergeforce=force, labels=labels | |||||
| ) | |||||
| statemod.addunfinished( | statemod.addunfinished( | ||||
| b'merge', | b'merge', | ||||
| fname=None, | fname=None, | ||||
| clearable=True, | clearable=True, | ||||
| allowcommit=True, | allowcommit=True, | ||||
| cmdmsg=_(b'outstanding uncommitted merge'), | cmdmsg=_(b'outstanding uncommitted merge'), | ||||
| if warndest: | if warndest: | ||||
| destutil.statusotherdests(ui, repo) | destutil.statusotherdests(ui, repo) | ||||
| return ret | return ret | ||||
| def merge( | def merge( | ||||
| repo, node, force=False, remind=True, mergeforce=False, labels=None, | repo, node, force=False, remind=True, labels=None, | ||||
| ): | ): | ||||
| """Branch merge with node, resolving changes. Return true if any | """Branch merge with node, resolving changes. Return true if any | ||||
| unresolved conflicts.""" | unresolved conflicts.""" | ||||
| stats = mergemod.update( | stats = mergemod.update( | ||||
| repo, | repo, | ||||
| node, | node, | ||||
| branchmerge=True, | branchmerge=True, | ||||
| force=force, | force=force, | ||||
| mergeforce=mergeforce, | mergeforce=force, | ||||
| labels=labels, | labels=labels, | ||||
| ) | ) | ||||
| _showstats(repo, stats) | _showstats(repo, stats) | ||||
| if stats.unresolvedcount: | if stats.unresolvedcount: | ||||
| repo.ui.status( | repo.ui.status( | ||||
| _( | _( | ||||
| b"use 'hg resolve' to retry unresolved file merges " | b"use 'hg resolve' to retry unresolved file merges " | ||||
| b"or 'hg merge --abort' to abandon\n" | b"or 'hg merge --abort' to abandon\n" | ||||
| == Internal API Changes == | == Internal API Changes == | ||||
| * The deprecated `ui.progress()` has now been deleted. Please use | * The deprecated `ui.progress()` has now been deleted. Please use | ||||
| `ui.makeprogress()` instead. | `ui.makeprogress()` instead. | ||||
| * `hg.merge()` has lost its `abort` argument. Please call | * `hg.merge()` has lost its `abort` argument. Please call | ||||
| `hg.abortmerge()` directly instead. | `hg.abortmerge()` directly instead. | ||||
| * `hg.merge()` has lost its `mergeforce` argument. It should have | |||||
| only ever been called with the same value as the `force` argument. | |||||
| * The `*others` argument of `cmdutil.check_incompatible_arguments()` | * The `*others` argument of `cmdutil.check_incompatible_arguments()` | ||||
| changed from being varargs argument to being a single collection. | changed from being varargs argument to being a single collection. | ||||