This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8534

flags: read flag from dirstate/disk for workingcopyctx (issue5743)
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG4234c9af515d: flags: read flag from dirstate/disk for workingcopyctx (issue5743)
Summary

In 491855ea9d62, various piece of code are moved from committablectx to
workingctx. The reason given is "These read from the dirstate, so they shouldn't
be used in other subclasses."

At least for flags this change introduce a bug, because the value flags end up being
read from _manifest disregarding the actual state in the working copy (ie: on
disk). When merging exec flag change with renames, this means a new files (the
local content, renamed) is properly written on disk, with the right flags, but
the flags part is later ignored when actually reading flags during merge.

It is not clear to me why the flags function was moved, because the code does
not actually hit the dirstate (the reason given in the changeset description).
So I am moving it back to were it comes from and we use a simpler version of
that code (that hit the dirstate everytime) in workingcopyctx. This fix the last
know bug with merging rename and executable byte changes.

Other similar bug might be lurking in 491855ea9d62, but I have not investigated
them.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (18 lines)
Mtests/test-merge-exec.t (1 line)

Diff 21502

mercurial/context.py

return phase return phase
def hidden(self): def hidden(self):
return False return False
def children(self): def children(self):
return [] return []
def flags(self, path):
if '_manifest' in self.__dict__:
try:
return self._manifest.flags(path)
except KeyError:
return b''
try:
return self._flagfunc(path)
except OSError:
return b''
def ancestor(self, c2): def ancestor(self, c2):
"""return the "best" ancestor context of self and c2""" """return the "best" ancestor context of self and c2"""
return self._parents[0].ancestor(c2) # punt on two parents for now return self._parents[0].ancestor(c2) # punt on two parents for now
def ancestors(self): def ancestors(self):
for p in self._parents: for p in self._parents:
yield p yield p
for a in self._repo.changelog.ancestors( for a in self._repo.changelog.ancestors(
return func return func
@propertycache @propertycache
def _flagfunc(self): def _flagfunc(self):
return self._repo.dirstate.flagfunc(self._buildflagfunc) return self._repo.dirstate.flagfunc(self._buildflagfunc)
def flags(self, path): def flags(self, path):
if '_manifest' in self.__dict__:
try:
return self._manifest.flags(path)
except KeyError:
return b''
try: try:
return self._flagfunc(path) return self._flagfunc(path)
except OSError: except OSError:
return b'' return b''
def filectx(self, path, filelog=None): def filectx(self, path, filelog=None):
"""get a file context from the working directory""" """get a file context from the working directory"""
return workingfilectx( return workingfilectx(

tests/test-merge-exec.t

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
(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
R a R a
$ [ -x z ] || echo "executable bit lost" $ [ -x z ] || echo "executable bit lost"
executable bit lost
$ cd .. $ cd ..