| durin42 |
| hg-reviewers |
Since b86fc43e4b73, the local flag were blindly taken. This resulted in bug when
rename are involved. exec flag change are now properly merged (when merged from
the rename side).
Another bug is affecting this when merging from the side without the rename.
| 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 (27 lines) | |||
| M | tests/test-merge-exec.t (1 line) |
| # s: "i hate that." | # s: "i hate that." | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from . import ( | from . import ( | ||||
| error, | error, | ||||
| mdiff, | mdiff, | ||||
| node as nodemod, | |||||
| pycompat, | pycompat, | ||||
| util, | |||||
| ) | ) | ||||
| from .utils import stringutil | from .utils import stringutil | ||||
| class CantReprocessAndShowBase(Exception): | class CantReprocessAndShowBase(Exception): | ||||
| pass | pass | ||||
| 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 _bytes_to_set(b): | |||||
| """turns a multiple bytes (usually flags) into a set of individual byte""" | |||||
| return set(b[x : x + 1] for x in range(len(b))) | |||||
| def is_null(ctx): | |||||
| if not util.safehasattr(ctx, "node"): | |||||
| return False | |||||
| 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) | opts = pycompat.byteskwargs(opts) | ||||
| def readctx(ctx): | def readctx(ctx): | ||||
| 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(b'print'): | ||||
| ui.fout.write(line) | ui.fout.write(line) | ||||
| else: | else: | ||||
| mergedtext += line | mergedtext += line | ||||
| # merge flags if necessary | |||||
| flags = localctx.flags() | |||||
| localflags = _bytes_to_set(flags) | |||||
| otherflags = _bytes_to_set(otherctx.flags()) | |||||
| if is_null(basectx) and localflags != otherflags: | |||||
| baseflags = _bytes_to_set(basectx.flags()) | |||||
| flags = localflags & otherflags | |||||
| for f in localflags.symmetric_difference(otherflags): | |||||
| if f not in baseflags: | |||||
| flags.add(f) | |||||
| flags = b''.join(sorted(flags)) | |||||
| if not opts.get(b'print'): | if not opts.get(b'print'): | ||||
| localctx.write(mergedtext, localctx.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 | ||||
| $ hg merge 'desc("make a executable")' | $ hg merge 'desc("make a executable")' | ||||
| merging z and a to z | merging z and a to z | ||||
| 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| $ hg st --copies | $ hg st --copies | ||||
| M z | M z | ||||
| a | a | ||||
| $ [ -x z ] || echo "executable bit lost" | $ [ -x z ] || echo "executable bit lost" | ||||
| executable bit lost | |||||
| merge them (from the chmod side) | merge them (from the chmod side) | ||||
| $ hg up -C 'desc("make a executable")' | $ hg up -C 'desc("make a executable")' | ||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| $ hg merge 'desc("rename a to z")' | $ hg merge 'desc("rename a to z")' | ||||
| merging a and z to z | merging a and z to z | ||||
| 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||