This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10931

dirstate: add an explicit `from_p2` parameter to `_addpath`
ClosedPublic

Authored by marmoute on Jul 2 2021, 11:17 AM.

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1f571077222d: dirstate: add an explicit `from_p2` parameter to `_addpath`
Summary

This lets says what we mean instead of using magic value. The lower level can
then decide how to express that.

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/dirstate.py (27 lines)

Diff 28763

mercurial/dirstate.py

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
def _addpath(self, f, state, mode, size=NONNORMAL, mtime=AMBIGUOUS_TIME): def _addpath(
self,
f,
state,
mode,
size=NONNORMAL,
mtime=AMBIGUOUS_TIME,
from_p2=False,
):
oldstate = self[f] oldstate = self[f]
if state == b'a' or oldstate == b'r': if state == b'a' or oldstate == b'r':
scmutil.checkfilename(f) scmutil.checkfilename(f)
if self._map.hastrackeddir(f): if self._map.hastrackeddir(f):
msg = _(b'directory %r already in dirstate') msg = _(b'directory %r already in dirstate')
msg %= pycompat.bytestr(f) msg %= pycompat.bytestr(f)
raise error.Abort(msg) raise error.Abort(msg)
# shadows # shadows
for d in pathutil.finddirs(f): for d in pathutil.finddirs(f):
if self._map.hastrackeddir(d): if self._map.hastrackeddir(d):
break break
entry = self._map.get(d) entry = self._map.get(d)
if entry is not None and entry[0] != b'r': if entry is not None and entry[0] != b'r':
msg = _(b'file %r in dirstate clashes with %r') msg = _(b'file %r in dirstate clashes with %r')
msg %= (pycompat.bytestr(d), pycompat.bytestr(f)) msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
raise error.Abort(msg) raise error.Abort(msg)
if size != NONNORMAL and size != FROM_P2: if from_p2:
size = FROM_P2
mtime = AMBIGUOUS_TIME
else:
assert size != FROM_P2
if size != NONNORMAL:
size = size & _rangemask size = size & _rangemask
if mtime != AMBIGUOUS_TIME: if mtime != AMBIGUOUS_TIME:
mtime = mtime & _rangemask mtime = mtime & _rangemask
self._dirty = True self._dirty = True
self._updatedfiles.add(f) self._updatedfiles.add(f)
self._map.addfile(f, oldstate, state, mode, size, mtime) self._map.addfile(f, oldstate, state, mode, size, mtime)
def normal(self, f, parentfiledata=None): def normal(self, f, parentfiledata=None):
"""Mark a file normal and clean. """Mark a file normal and clean.
parentfiledata: (mode, size, mtime) of the clean file parentfiledata: (mode, size, mtime) of the clean file
def otherparent(self, f): def otherparent(self, f):
'''Mark as coming from the other parent, always dirty.''' '''Mark as coming from the other parent, always dirty.'''
if self._pl[1] == self._nodeconstants.nullid: if self._pl[1] == self._nodeconstants.nullid:
msg = _(b"setting %r to other parent only allowed in merges") % f msg = _(b"setting %r to other parent only allowed in merges") % f
raise error.Abort(msg) raise error.Abort(msg)
if f in self and self[f] == b'n': if f in self and self[f] == b'n':
# merge-like # merge-like
self._addpath(f, b'm', 0, FROM_P2) self._addpath(f, b'm', 0, from_p2=True)
else: else:
# add-like # add-like
self._addpath(f, b'n', 0, FROM_P2) self._addpath(f, b'n', 0, from_p2=True)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
def add(self, f): def add(self, f):
'''Mark a file added.''' '''Mark a file added.'''
self._addpath(f, b'a', 0) self._addpath(f, b'a', 0)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
def remove(self, f): def remove(self, f):