| pulkit |
| hg-reviewers |
There was little reason to use pycompat.byteskwargs() in
simplemerge() as far as I could tell.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/simplemerge.py (15 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| return unc | return unc | ||||
| def _verifytext(text, path, ui, opts): | def _verifytext(text, path, ui, opts): | ||||
| """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(b'quiet'): | if not opts.get('quiet'): | ||||
| ui.warn(_(b'warning: %s\n') % msg) | ui.warn(_(b'warning: %s\n') % msg) | ||||
| if not opts.get(b'text'): | if not opts.get('text'): | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| return text | return text | ||||
| def _picklabels(defaults, overrides): | def _picklabels(defaults, overrides): | ||||
| if len(overrides) > 3: | if len(overrides) > 3: | ||||
| raise error.Abort(_(b"can only specify three labels.")) | raise error.Abort(_(b"can only specify three labels.")) | ||||
| result = defaults[:] | result = defaults[:] | ||||
| for i, override in enumerate(overrides): | for i, override in enumerate(overrides): | ||||
| result[i] = override | result[i] = override | ||||
| return result | return result | ||||
| def is_not_null(ctx): | def is_not_null(ctx): | ||||
| if not util.safehasattr(ctx, "node"): | if not util.safehasattr(ctx, "node"): | ||||
| return False | return False | ||||
| return ctx.node() != nodemod.nullid | return ctx.node() != nodemod.nullid | ||||
| def simplemerge(ui, localctx, basectx, otherctx, **opts): | def simplemerge(ui, localctx, basectx, otherctx, **opts): | ||||
| """Performs the simplemerge algorithm. | """Performs the simplemerge algorithm. | ||||
| The merged result is written into `localctx`. | The merged result is written into `localctx`. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| 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, opts) | ||||
| mode = opts.get(b'mode', b'merge') | mode = opts.get('mode', b'merge') | ||||
| name_a, name_b, name_base = None, None, None | name_a, name_b, name_base = None, None, None | ||||
| if mode != b'union': | if mode != b'union': | ||||
| name_a, name_b, name_base = _picklabels( | name_a, name_b, name_base = _picklabels( | ||||
| [localctx.path(), otherctx.path(), None], opts.get(b'label', []) | [localctx.path(), otherctx.path(), None], opts.get('label', []) | ||||
| ) | ) | ||||
| try: | try: | ||||
| localtext = readctx(localctx) | localtext = readctx(localctx) | ||||
| basetext = readctx(basectx) | basetext = readctx(basectx) | ||||
| othertext = readctx(otherctx) | othertext = readctx(otherctx) | ||||
| except error.Abort: | except error.Abort: | ||||
| return 1 | return 1 | ||||
| m3 = Merge3Text(basetext, localtext, othertext) | m3 = Merge3Text(basetext, localtext, othertext) | ||||
| extrakwargs = { | extrakwargs = { | ||||
| b"localorother": opts.get(b"localorother", None), | b"localorother": opts.get("localorother", None), | ||||
| b'minimize': True, | b'minimize': True, | ||||
| } | } | ||||
| if mode == b'union': | if mode == b'union': | ||||
| extrakwargs[b'start_marker'] = None | extrakwargs[b'start_marker'] = None | ||||
| extrakwargs[b'mid_marker'] = None | extrakwargs[b'mid_marker'] = None | ||||
| extrakwargs[b'end_marker'] = None | extrakwargs[b'end_marker'] = None | ||||
| elif name_base is not None: | elif name_base is not None: | ||||
| extrakwargs[b'base_marker'] = b'|||||||' | extrakwargs[b'base_marker'] = b'|||||||' | ||||
| extrakwargs[b'name_base'] = name_base | extrakwargs[b'name_base'] = name_base | ||||
| extrakwargs[b'minimize'] = False | extrakwargs[b'minimize'] = False | ||||
| mergedtext = b"" | mergedtext = b"" | ||||
| for line in m3.merge_lines( | for line in m3.merge_lines( | ||||
| name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs) | name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs) | ||||
| ): | ): | ||||
| if opts.get(b'print'): | if opts.get('print'): | ||||
| ui.fout.write(line) | ui.fout.write(line) | ||||
| else: | else: | ||||
| mergedtext += line | mergedtext += line | ||||
| # merge flags if necessary | # merge flags if necessary | ||||
| flags = localctx.flags() | flags = localctx.flags() | ||||
| localflags = set(pycompat.iterbytestr(flags)) | localflags = set(pycompat.iterbytestr(flags)) | ||||
| otherflags = set(pycompat.iterbytestr(otherctx.flags())) | otherflags = set(pycompat.iterbytestr(otherctx.flags())) | ||||
| if is_not_null(basectx) and localflags != otherflags: | if is_not_null(basectx) and localflags != otherflags: | ||||
| baseflags = set(pycompat.iterbytestr(basectx.flags())) | baseflags = set(pycompat.iterbytestr(basectx.flags())) | ||||
| commonflags = localflags & otherflags | commonflags = localflags & otherflags | ||||
| addedflags = (localflags ^ otherflags) - baseflags | addedflags = (localflags ^ otherflags) - baseflags | ||||
| flags = b''.join(sorted(commonflags | addedflags)) | flags = b''.join(sorted(commonflags | addedflags)) | ||||
| if not opts.get(b'print'): | if not opts.get('print'): | ||||
| localctx.write(mergedtext, flags) | localctx.write(mergedtext, flags) | ||||
| if m3.conflicts and not mode == b'union': | if m3.conflicts and not mode == b'union': | ||||
| return 1 | return 1 | ||||