Mercurial > hg
comparison contrib/simplemerge @ 48555:c91418480cb0
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
Before this patch, we use a combination of `mode` and `labels` to
decide which marker style to use. That's mostly my own fault because I
was the one who added the `mergediff` as a "mode" instead of adding a
separate argument for marker style. Still, let's make these arguments
more orthogonal by ignoring the number of labels when deciding which
marker style to use.
This refactoring makes it a little clearer in the simplemerge
*extension* that passing more than 2 `--label` arguments changes the
marker style.
Differential Revision: https://phab.mercurial-scm.org/D11972
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 14 Dec 2021 13:12:56 -0800 |
parents | c102b704edb5 |
children | 6ad70879d2bd |
comparison
equal
deleted
inserted
replaced
48554:0dc698c91ca0 | 48555:c91418480cb0 |
---|---|
78 if opts[b'help']: | 78 if opts[b'help']: |
79 showhelp() | 79 showhelp() |
80 sys.exit(0) | 80 sys.exit(0) |
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: | |
84 opts[b'mode'] = b'merge3' | |
83 local, base, other = args | 85 local, base, other = args |
84 sys.exit( | 86 sys.exit( |
85 simplemerge.simplemerge( | 87 simplemerge.simplemerge( |
86 uimod.ui.load(), | 88 uimod.ui.load(), |
87 context.arbitraryfilectx(local), | 89 context.arbitraryfilectx(local), |