This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11012

dirstate: add a function to update tracking status while "moving" parents
ClosedPublic

Authored by marmoute on Jul 7 2021, 5:20 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0f5c203eb5ab: dirstate: add a function to update tracking status while "moving" parents
Summary

The scmutil.dirstateparent is moving the dirstate parent without touching the
working copy. It is used by history-rewriting operations like amending of
folding.

The function was directly doing the "low level" computation and dirstate
change. All that logic belong to the dirstate and should be moved there.

For this purpose we introduce a new function that does just that and use it.

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.

Event Timeline

marmoute created this revision.Jul 7 2021, 5:20 PM
baymax edited parent revisions, added: D11011: dirstate: introduce an internal `_remove` method; removed: D11023: dirstate: introduce an internal `_drop` method.Jul 8 2021, 4:42 AM
baymax updated this revision to Diff 28964.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax edited parent revisions, added: D11023: dirstate: introduce an internal `_drop` method; removed: D11011: dirstate: introduce an internal `_remove` method.Jul 8 2021, 9:18 AM
baymax updated this revision to Diff 28997.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Jul 9 2021, 12:01 PM
This revision is now accepted and ready to land.Jul 9 2021, 12:01 PM
baymax updated this revision to Diff 29144.Jul 10 2021, 3:09 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax retitled this revision from dirstate: add a function to update tracking status while "moving" parent to dirstate: add a function to update tracking status while "moving" parents.Jul 10 2021, 4:50 PM
baymax edited the summary of this revision. (Show Details)
baymax updated this revision to Diff 29148.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 29157.Jul 11 2021, 7:01 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 29244.Jul 15 2021, 11:16 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit added a subscriber: pulkit.Jul 19 2021, 8:32 AM
pulkit added inline comments.
mercurial/dirstate.py
78

This will need a b'' prefix, can you follow-up for that?

marmoute added inline comments.Jul 19 2021, 8:56 AM
mercurial/dirstate.py
78

The b'' prefix is incompatible with func.__name__ is ti strictly necessary ?

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (49 lines)
Mmercurial/scmutil.py (18 lines)

Diff 29270

mercurial/dirstate.py

tmpfd, tmpname = vfs.mkstemp() tmpfd, tmpname = vfs.mkstemp()
try: try:
return os.fstat(tmpfd)[stat.ST_MTIME] return os.fstat(tmpfd)[stat.ST_MTIME]
finally: finally:
os.close(tmpfd) os.close(tmpfd)
vfs.unlink(tmpname) vfs.unlink(tmpname)
def requires_parents_change(func):
def wrap(self, *args, **kwargs):
if not self.pendingparentchange():
msg = 'calling `%s` outside of a parentchange context'
pulkitUnsubmitted
Not Done

This will need a b'' prefix, can you follow-up for that?

pulkit: This will need a `b''` prefix, can you follow-up for that?
marmouteAuthorUnsubmitted
Done

The b'' prefix is incompatible with func.__name__ is ti strictly necessary ?

marmoute: The b'' prefix is incompatible with `func.__name__` is ti strictly necessary ?
msg %= func.__name__
raise error.ProgrammingError(msg)
return func(self, *args, **kwargs)
return wrap
@interfaceutil.implementer(intdirstate.idirstate) @interfaceutil.implementer(intdirstate.idirstate)
class dirstate(object): class dirstate(object):
def __init__( def __init__(
self, self,
opener, opener,
ui, ui,
root, root,
validate, validate,
self._updatedfiles.add(dest) self._updatedfiles.add(dest)
def copied(self, file): def copied(self, file):
return self._map.copymap.get(file, None) return self._map.copymap.get(file, None)
def copies(self): def copies(self):
return self._map.copymap return self._map.copymap
@requires_parents_change
def update_file_reference(
self,
filename,
p1_tracked,
):
"""Set a file as tracked in the parent (or not)
This is to be called when adjust the dirstate to a new parent after an history
rewriting operation.
It should not be called during a merge (p2 != nullid) and only within
a `with dirstate.parentchange():` context.
"""
if self.in_merge:
msg = b'update_file_reference should not be called when merging'
raise error.ProgrammingError(msg)
entry = self._map.get(filename)
if entry is None:
wc_tracked = False
else:
wc_tracked = entry.tracked
if p1_tracked and wc_tracked:
# the underlying reference might have changed, we will have to
# check it.
self.normallookup(filename)
elif not (p1_tracked or wc_tracked):
# the file is no longer relevant to anyone
self._drop(filename)
elif (not p1_tracked) and wc_tracked:
if not entry.added:
self._add(filename)
elif p1_tracked and not wc_tracked:
if entry is None or not entry.removed:
self._remove(filename)
else:
assert False, 'unreachable'
def _addpath( def _addpath(
self, self,
f, f,
mode=0, mode=0,
size=None, size=None,
mtime=None, mtime=None,
added=False, added=False,
merged=False, merged=False,

mercurial/scmutil.py

a matcher that doesn't match all the differences between the parent of the a matcher that doesn't match all the differences between the parent of the
working copy and newctx. working copy and newctx.
""" """
oldctx = repo[b'.'] oldctx = repo[b'.']
ds = repo.dirstate ds = repo.dirstate
copies = dict(ds.copies()) copies = dict(ds.copies())
ds.setparents(newctx.node(), repo.nullid) ds.setparents(newctx.node(), repo.nullid)
s = newctx.status(oldctx, match=match) s = newctx.status(oldctx, match=match)
for f in s.modified: for f in s.modified:
if ds[f] == b'r': ds.update_file_reference(f, p1_tracked=True)
# modified + removed -> removed
continue
ds.normallookup(f)
for f in s.added: for f in s.added:
if ds[f] == b'r': ds.update_file_reference(f, p1_tracked=False)
# added + removed -> unknown
ds.drop(f)
elif ds[f] != b'a':
ds.add(f)
for f in s.removed: for f in s.removed:
if ds[f] == b'a': ds.update_file_reference(f, p1_tracked=True)
# removed + added -> normal
ds.normallookup(f)
elif ds[f] != b'r':
ds.remove(f)
# Merge old parent and old working dir copies # Merge old parent and old working dir copies
oldcopies = copiesmod.pathcopies(newctx, oldctx, match) oldcopies = copiesmod.pathcopies(newctx, oldctx, match)
oldcopies.update(copies) oldcopies.update(copies)
copies = { copies = {
dst: oldcopies.get(src, src) dst: oldcopies.get(src, src)
for dst, src in pycompat.iteritems(oldcopies) for dst, src in pycompat.iteritems(oldcopies)
} }