This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8531

flags: account for flag change when tracking rename relevant to merge
ClosedPublic

Authored by marmoute on May 16 2020, 4:11 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGd452acc8cce8: flags: account for flag change when tracking rename relevant to merge
Summary

There are some logic filtering rename to the one relevant to the merge. That
logic was oblivious of flag change, leading to exec flag being dropped when
merged with a renamed.

There are two others bugs affecting this scenario. This patch fix the was where
there is not modification involved except for the flag change. Fixes for the
other bug are coming in later changesets.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (6 lines)
Mtests/test-merge-exec.t (14 lines)

Diff 21395

mercurial/copies.py

if src not in m1: if src not in m1:
# renamed on side 1, deleted on side 2 # renamed on side 1, deleted on side 2
renamedelete[src] = dsts1 renamedelete[src] = dsts1
elif src not in mb: elif src not in mb:
# Work around the "short-circuit to avoid issues with merge states" # Work around the "short-circuit to avoid issues with merge states"
# thing in pathcopies(): pathcopies(x, y) can return a copy where the # thing in pathcopies(): pathcopies(x, y) can return a copy where the
# destination doesn't exist in y. # destination doesn't exist in y.
pass pass
elif m2[src] != mb[src]: elif mb[src] != m2[src] and not _related(c2[src], base[src]):
if not _related(c2[src], base[src]):
return return
elif mb[src] != m2[src] or mb.flags(src) != m2.flags(src):
# modified on side 2 # modified on side 2
for dst in dsts1: for dst in dsts1:
copy[dst] = src copy[dst] = src
class branch_copies(object): class branch_copies(object):
"""Information about copies made on one side of a merge/graft. """Information about copies made on one side of a merge/graft.

tests/test-merge-exec.t

a a
R a R a
$ hg ci -m "rename a to z" $ hg ci -m "rename a to z"
created new head created new head
merge them (from the rename side) merge them (from the rename side)
$ hg merge 'desc("make a executable")' $ hg merge 'desc("make a executable")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved (false !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved (true !)
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg st --copies $ hg st --copies
M z (false !) M z
a (false !) a
$ [ -x z ] || echo "executable bit lost" $ [ -x z ] || echo "executable bit lost"
executable bit lost (true !)
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")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved (false !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 1 files removed, 0 files unresolved (true !)
(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 (false !) a
R a R a
$ [ -x z ] || echo "executable bit lost" $ [ -x z ] || echo "executable bit lost"
executable bit lost (true !)
$ cd .. $ cd ..