| pulkit |
| hg-reviewers |
| 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 (6 lines) | |||
| M | mercurial/hg.py (11 lines) | |||
| M | relnotes/next (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| 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, | repo, node, force=force, mergeforce=force, labels=labels | ||||
| 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, | ||||
| if warndest: | if warndest: | ||||
| destutil.statusotherdests(ui, repo) | destutil.statusotherdests(ui, repo) | ||||
| return ret | return ret | ||||
| def merge( | def merge( | ||||
| repo, | repo, node, force=None, remind=True, mergeforce=False, labels=None, | ||||
| node, | |||||
| force=None, | |||||
| remind=True, | |||||
| mergeforce=False, | |||||
| labels=None, | |||||
| abort=False, | |||||
| ): | ): | ||||
| """Branch merge with node, resolving changes. Return true if any | """Branch merge with node, resolving changes. Return true if any | ||||
| unresolved conflicts.""" | unresolved conflicts.""" | ||||
| if abort: | |||||
| return abortmerge(repo.ui, repo) | |||||
| stats = mergemod.update( | stats = mergemod.update( | ||||
| repo, | repo, | ||||
| node, | node, | ||||
| branchmerge=True, | branchmerge=True, | ||||
| force=force, | force=force, | ||||
| mergeforce=mergeforce, | mergeforce=mergeforce, | ||||
| labels=labels, | labels=labels, | ||||
| ) | ) | ||||
| == New Features == | == New Features == | ||||
| == New Experimental Features == | == New Experimental Features == | ||||
| == Bug Fixes == | == Bug Fixes == | ||||
| == Backwards Compatibility Changes == | == Backwards Compatibility Changes == | ||||
| == 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.abortmerge()` directly instead. | |||||