| Alphare |
| hg-reviewers |
The simplemerge module is library code; it should not get an
unmodified opts dict from the simplemerge extension.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/simplemerge (9 lines) | |||
| M | mercurial/simplemerge.py (28 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| #!/usr/bin/env python3 | #!/usr/bin/env python3 | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import getopt | import getopt | ||||
| import sys | import sys | ||||
| import hgdemandimport | import hgdemandimport | ||||
| hgdemandimport.enable() | hgdemandimport.enable() | ||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial import ( | from mercurial import ( | ||||
| context, | context, | ||||
| error, | error, | ||||
| fancyopts, | fancyopts, | ||||
| pycompat, | |||||
| simplemerge, | simplemerge, | ||||
| ui as uimod, | ui as uimod, | ||||
| ) | ) | ||||
| from mercurial.utils import procutil, stringutil | from mercurial.utils import procutil, stringutil | ||||
| options = [ | options = [ | ||||
| (b'L', b'label', [], _(b'labels to use on conflict markers')), | (b'L', b'label', [], _(b'labels to use on conflict markers')), | ||||
| (b'a', b'text', None, _(b'treat all files as text')), | (b'a', b'text', None, _(b'treat all files as text')), | ||||
| args = fancyopts.fancyopts(bargv, options, opts) | args = fancyopts.fancyopts(bargv, options, opts) | ||||
| except getopt.GetoptError as e: | except getopt.GetoptError as e: | ||||
| raise ParseError(e) | raise ParseError(e) | ||||
| if opts[b'help']: | if opts[b'help']: | ||||
| showhelp() | showhelp() | ||||
| sys.exit(0) | sys.exit(0) | ||||
| if len(args) != 3: | if len(args) != 3: | ||||
| raise ParseError(_(b'wrong number of arguments').decode('utf8')) | raise ParseError(_(b'wrong number of arguments').decode('utf8')) | ||||
| mode = b'merge' | |||||
| if len(opts[b'label']) > 2: | if len(opts[b'label']) > 2: | ||||
| opts[b'mode'] = b'merge3' | mode = b'merge3' | ||||
| local, base, other = args | local, base, other = args | ||||
| overrides = opts[b'label'] | overrides = opts[b'label'] | ||||
| if len(overrides) > 3: | if len(overrides) > 3: | ||||
| raise error.InputError(b'can only specify three labels.') | raise error.InputError(b'can only specify three labels.') | ||||
| labels = [local, other, base] | labels = [local, other, base] | ||||
| labels[: len(overrides)] = overrides | labels[: len(overrides)] = overrides | ||||
| local_input = simplemerge.MergeInput( | local_input = simplemerge.MergeInput( | ||||
| context.arbitraryfilectx(local), labels[0] | context.arbitraryfilectx(local), labels[0] | ||||
| ) | ) | ||||
| other_input = simplemerge.MergeInput( | other_input = simplemerge.MergeInput( | ||||
| context.arbitraryfilectx(other), labels[1] | context.arbitraryfilectx(other), labels[1] | ||||
| ) | ) | ||||
| base_input = simplemerge.MergeInput( | base_input = simplemerge.MergeInput( | ||||
| context.arbitraryfilectx(base), labels[2] | context.arbitraryfilectx(base), labels[2] | ||||
| ) | ) | ||||
| sys.exit( | sys.exit( | ||||
| simplemerge.simplemerge( | simplemerge.simplemerge( | ||||
| uimod.ui.load(), | uimod.ui.load(), | ||||
| local_input, | local_input, | ||||
| base_input, | base_input, | ||||
| other_input, | other_input, | ||||
| **pycompat.strkwargs(opts) | mode, | ||||
| quiet=opts.get(b'quiet'), | |||||
| allow_binary=opts.get(b'text'), | |||||
| print_result=opts.get(b'print'), | |||||
| ) | ) | ||||
| ) | ) | ||||
| except ParseError as e: | except ParseError as e: | ||||
| e = stringutil.forcebytestr(e) | e = stringutil.forcebytestr(e) | ||||
| procutil.stdout.write(b"%s: %s\n" % (sys.argv[0].encode('utf8'), e)) | procutil.stdout.write(b"%s: %s\n" % (sys.argv[0].encode('utf8'), e)) | ||||
| showhelp() | showhelp() | ||||
| sys.exit(1) | sys.exit(1) | ||||
| except error.Abort as e: | except error.Abort as e: | ||||
| procutil.stderr.write(b"abort: %s\n" % e) | procutil.stderr.write(b"abort: %s\n" % e) | ||||
| sys.exit(255) | sys.exit(255) | ||||
| except KeyboardInterrupt: | except KeyboardInterrupt: | ||||
| sys.exit(255) | sys.exit(255) | ||||
| intbase = len(self.base) | intbase = len(self.base) | ||||
| abase = len(self.a) | abase = len(self.a) | ||||
| bbase = len(self.b) | bbase = len(self.b) | ||||
| sl.append((intbase, intbase, abase, abase, bbase, bbase)) | sl.append((intbase, intbase, abase, abase, bbase, bbase)) | ||||
| return sl | return sl | ||||
| def _verifytext(text, path, ui, opts): | def _verifytext(text, path, ui, quiet=False, allow_binary=False): | ||||
| """verifies that text is non-binary (unless opts[text] is passed, | """verifies that text is non-binary (unless opts[text] is passed, | ||||
| then we just warn)""" | then we just warn)""" | ||||
| if stringutil.binary(text): | if stringutil.binary(text): | ||||
| msg = _(b"%s looks like a binary file.") % path | msg = _(b"%s looks like a binary file.") % path | ||||
| if not opts.get('quiet'): | if not quiet: | ||||
| ui.warn(_(b'warning: %s\n') % msg) | ui.warn(_(b'warning: %s\n') % msg) | ||||
| if not opts.get('text'): | if not allow_binary: | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| return text | return text | ||||
| def _format_labels(*inputs): | def _format_labels(*inputs): | ||||
| pad = max(len(input.label) if input.label else 0 for input in inputs) | pad = max(len(input.label) if input.label else 0 for input in inputs) | ||||
| labels = [] | labels = [] | ||||
| for input in inputs: | for input in inputs: | ||||
| fctx = attr.ib() | fctx = attr.ib() | ||||
| label = attr.ib(default=None) | label = attr.ib(default=None) | ||||
| # If the "detail" part is set, then that is rendered after the label and | # If the "detail" part is set, then that is rendered after the label and | ||||
| # separated by a ':'. The label is padded to make the ':' aligned among all | # separated by a ':'. The label is padded to make the ':' aligned among all | ||||
| # merge inputs. | # merge inputs. | ||||
| label_detail = attr.ib(default=None) | label_detail = attr.ib(default=None) | ||||
| def simplemerge(ui, local, base, other, **opts): | def simplemerge( | ||||
| ui, | |||||
| local, | |||||
| base, | |||||
| other, | |||||
| mode=b'merge', | |||||
| quiet=False, | |||||
| allow_binary=False, | |||||
| print_result=False, | |||||
| ): | |||||
| """Performs the simplemerge algorithm. | """Performs the simplemerge algorithm. | ||||
| The merged result is written into `localctx`. | The merged result is written into `localctx`. | ||||
| """ | """ | ||||
| def readctx(ctx): | def readctx(ctx): | ||||
| # Merges were always run in the working copy before, which means | # Merges were always run in the working copy before, which means | ||||
| # they used decoded data, if the user defined any repository | # they used decoded data, if the user defined any repository | ||||
| # filters. | # filters. | ||||
| # | # | ||||
| # Maintain that behavior today for BC, though perhaps in the future | # Maintain that behavior today for BC, though perhaps in the future | ||||
| # it'd be worth considering whether merging encoded data (what the | # it'd be worth considering whether merging encoded data (what the | ||||
| # repository usually sees) might be more useful. | # repository usually sees) might be more useful. | ||||
| return _verifytext(ctx.decodeddata(), ctx.path(), ui, opts) | return _verifytext( | ||||
| ctx.decodeddata(), | |||||
| ctx.path(), | |||||
| ui, | |||||
| quiet=quiet, | |||||
| allow_binary=allow_binary, | |||||
| ) | |||||
| try: | try: | ||||
| localtext = readctx(local.fctx) | localtext = readctx(local.fctx) | ||||
| basetext = readctx(base.fctx) | basetext = readctx(base.fctx) | ||||
| othertext = readctx(other.fctx) | othertext = readctx(other.fctx) | ||||
| except error.Abort: | except error.Abort: | ||||
| return True | return True | ||||
| m3 = Merge3Text(basetext, localtext, othertext) | m3 = Merge3Text(basetext, localtext, othertext) | ||||
| conflicts = False | conflicts = False | ||||
| mode = opts.get('mode', b'merge') | |||||
| if mode == b'union': | if mode == b'union': | ||||
| lines = _resolve(m3, (1, 2)) | lines = _resolve(m3, (1, 2)) | ||||
| elif mode == b'local': | elif mode == b'local': | ||||
| lines = _resolve(m3, (1,)) | lines = _resolve(m3, (1,)) | ||||
| elif mode == b'other': | elif mode == b'other': | ||||
| lines = _resolve(m3, (2,)) | lines = _resolve(m3, (2,)) | ||||
| else: | else: | ||||
| if mode == b'mergediff': | if mode == b'mergediff': | ||||
| labels = _format_labels(local, other, base) | labels = _format_labels(local, other, base) | ||||
| lines, conflicts = render_mergediff(m3, *labels) | lines, conflicts = render_mergediff(m3, *labels) | ||||
| elif mode == b'merge3': | elif mode == b'merge3': | ||||
| labels = _format_labels(local, other, base) | labels = _format_labels(local, other, base) | ||||
| lines, conflicts = render_merge3(m3, *labels) | lines, conflicts = render_merge3(m3, *labels) | ||||
| else: | else: | ||||
| labels = _format_labels(local, other) | labels = _format_labels(local, other) | ||||
| lines, conflicts = render_minimized(m3, *labels) | lines, conflicts = render_minimized(m3, *labels) | ||||
| mergedtext = b''.join(lines) | mergedtext = b''.join(lines) | ||||
| if opts.get('print'): | if print_result: | ||||
| ui.fout.write(mergedtext) | ui.fout.write(mergedtext) | ||||
| else: | else: | ||||
| # local.fctx.flags() already has the merged flags (done in | # local.fctx.flags() already has the merged flags (done in | ||||
| # mergestate.resolve()) | # mergestate.resolve()) | ||||
| local.fctx.write(mergedtext, local.fctx.flags()) | local.fctx.write(mergedtext, local.fctx.flags()) | ||||
| return conflicts | return conflicts | ||||