Mercurial > public > mercurial-scm > hg-stable
comparison contrib/simplemerge @ 48588:6ad70879d2bd
simplemerge: move default labels to simplemerge extension
I want to remove knowledge of paths from the `simplemerge` core
module. As part of that, let's move the default labels from the core
module to the extension.
Differential Revision: https://phab.mercurial-scm.org/D11977
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 07 Jan 2022 23:29:19 -0800 |
| parents | c91418480cb0 |
| children | 77e24ee8994b |
comparison
equal
deleted
inserted
replaced
| 48587:b5e1283c0475 | 48588:6ad70879d2bd |
|---|---|
| 81 if len(args) != 3: | 81 if len(args) != 3: |
| 82 raise ParseError(_(b'wrong number of arguments').decode('utf8')) | 82 raise ParseError(_(b'wrong number of arguments').decode('utf8')) |
| 83 if len(opts[b'label']) > 2: | 83 if len(opts[b'label']) > 2: |
| 84 opts[b'mode'] = b'merge3' | 84 opts[b'mode'] = b'merge3' |
| 85 local, base, other = args | 85 local, base, other = args |
| 86 overrides = opts[b'label'] | |
| 87 labels = [local, other, base] | |
| 88 labels[: len(overrides)] = overrides | |
| 89 opts[b'label'] = labels | |
| 86 sys.exit( | 90 sys.exit( |
| 87 simplemerge.simplemerge( | 91 simplemerge.simplemerge( |
| 88 uimod.ui.load(), | 92 uimod.ui.load(), |
| 89 context.arbitraryfilectx(local), | 93 context.arbitraryfilectx(local), |
| 90 context.arbitraryfilectx(base), | 94 context.arbitraryfilectx(base), |