Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 44251:6744859ff3ee
merge: call hg.abortmerge() directly and return early
It's seem really weird to go through a lot of unrelated code before we
call `hg.merge(..., abort=True)` when we can just call
`hg.abortmerge()` and return early.
Differential Revision: https://phab.mercurial-scm.org/D7995
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 24 Jan 2020 16:05:11 -0800 |
| parents | 75c2ca094d3a |
| children | 1850066f9e36 |
comparison
equal
deleted
inserted
replaced
| 44250:2b6632d64328 | 44251:6744859ff3ee |
|---|---|
| 4855 _(b'cannot abort merge with %s in progress') % (state._opname), | 4855 _(b'cannot abort merge with %s in progress') % (state._opname), |
| 4856 hint=state.hint(), | 4856 hint=state.hint(), |
| 4857 ) | 4857 ) |
| 4858 if node: | 4858 if node: |
| 4859 raise error.Abort(_(b"cannot specify a node with --abort")) | 4859 raise error.Abort(_(b"cannot specify a node with --abort")) |
| 4860 return hg.abortmerge(repo.ui, repo) | |
| 4861 | |
| 4860 if opts.get(b'rev') and node: | 4862 if opts.get(b'rev') and node: |
| 4861 raise error.Abort(_(b"please specify just one revision")) | 4863 raise error.Abort(_(b"please specify just one revision")) |
| 4862 if not node: | 4864 if not node: |
| 4863 node = opts.get(b'rev') | 4865 node = opts.get(b'rev') |
| 4864 | 4866 |
| 4865 if node: | 4867 if node: |
| 4866 node = scmutil.revsingle(repo, node).node() | 4868 node = scmutil.revsingle(repo, node).node() |
| 4867 | 4869 |
| 4868 if not node and not abort: | 4870 if not node: |
| 4869 if ui.configbool(b'commands', b'merge.require-rev'): | 4871 if ui.configbool(b'commands', b'merge.require-rev'): |
| 4870 raise error.Abort( | 4872 raise error.Abort( |
| 4871 _( | 4873 _( |
| 4872 b'configuration requires specifying revision to merge ' | 4874 b'configuration requires specifying revision to merge ' |
| 4873 b'with' | 4875 b'with' |
| 4896 repo, | 4898 repo, |
| 4897 node, | 4899 node, |
| 4898 force=force, | 4900 force=force, |
| 4899 mergeforce=force, | 4901 mergeforce=force, |
| 4900 labels=labels, | 4902 labels=labels, |
| 4901 abort=abort, | |
| 4902 ) | 4903 ) |
| 4903 | 4904 |
| 4904 | 4905 |
| 4905 statemod.addunfinished( | 4906 statemod.addunfinished( |
| 4906 b'merge', | 4907 b'merge', |