This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10928

dirstate: introduce a symbolic constant for the AMBIGUOUS_TIME marker
ClosedPublic

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

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3f13dfa1fa78: dirstate: introduce a symbolic constant for the AMBIGUOUS_TIME marker
Summary

This is going to be clearer and easier to track than -1. Ultimately I would
like to get ride of this special value everywhere but in the lower level,
however we need to clarify the API first. This changeset is part of such
clarification.

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 2 2021, 11:17 AM
SimonSapin added a subscriber: SimonSapin.Jul 2 2021, 11:56 AM

+1 for having a named constant but I’m not sure about the AMBIGUOUS_TIME name. mtime == -1 is used together with state == 'n' indeed to indicate an ambiguous time, but it also for other values of state where the mtime field is simply unused. In the later cases the time is not necessarily ambiguous, it’s just irrelevant.

marmoute added a comment.Jul 2 2021, 2:55 PM
In D10928#167155, @SimonSapin wrote:

+1 for having a named constant but I’m not sure about the AMBIGUOUS_TIME name. mtime == -1 is used together with state == 'n' indeed to indicate an ambiguous time, but it also for other values of state where the mtime field is simply unused. In the later cases the time is not necessarily ambiguous, it’s just irrelevant.

same feedback as for the previous one. Unless we have a much better name at hand, I don't think this is an issue since the goal is to make this dissapear.

SimonSapin accepted this revision.Jul 2 2021, 6:25 PM

Sounds good

pulkit accepted this revision.Jul 3 2021, 7:40 AM
This revision is now accepted and ready to land.Jul 3 2021, 7:40 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (17 lines)

Diff 28760

mercurial/dirstate.py

# a special value used internally for `size` if the file come from the other parent # a special value used internally for `size` if the file come from the other parent
FROM_P2 = -2 FROM_P2 = -2
# a special value used internally for `size` if the file is modified/merged/added # a special value used internally for `size` if the file is modified/merged/added
NONNORMAL = -1 NONNORMAL = -1
# a special value used internally for `time` if the time is ambigeous
AMBIGUOUS_TIME = -1
class repocache(filecache): class repocache(filecache):
"""filecache for files in .hg/""" """filecache for files in .hg/"""
def join(self, obj, fname): def join(self, obj, fname):
return obj._opener.join(fname) return obj._opener.join(fname)
self.merge(f) self.merge(f)
elif entry[2] == FROM_P2: elif entry[2] == FROM_P2:
self.otherparent(f) self.otherparent(f)
if source: if source:
self.copy(source, f) self.copy(source, f)
return return
if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2: if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2:
return return
self._addpath(f, b'n', 0, NONNORMAL, -1) self._addpath(f, b'n', 0, NONNORMAL, AMBIGUOUS_TIME)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
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, -1) self._addpath(f, b'm', 0, FROM_P2, AMBIGUOUS_TIME)
else: else:
# add-like # add-like
self._addpath(f, b'n', 0, FROM_P2, -1) self._addpath(f, b'n', 0, FROM_P2, AMBIGUOUS_TIME)
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, NONNORMAL, -1) self._addpath(f, b'a', 0, NONNORMAL, AMBIGUOUS_TIME)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
def remove(self, f): def remove(self, f):
'''Mark a file removed.''' '''Mark a file removed.'''
self._dirty = True self._dirty = True
oldstate = self[f] oldstate = self[f]
size = 0 size = 0
if self._pl[1] != self._nodeconstants.nullid: if self._pl[1] != self._nodeconstants.nullid:
def addfile(self, f, oldstate, state, mode, size, mtime): def addfile(self, f, oldstate, state, mode, size, mtime):
"""Add a tracked file to the dirstate.""" """Add a tracked file to the dirstate."""
if oldstate in b"?r" and "_dirs" in self.__dict__: if oldstate in b"?r" and "_dirs" in self.__dict__:
self._dirs.addpath(f) self._dirs.addpath(f)
if oldstate == b"?" and "_alldirs" in self.__dict__: if oldstate == b"?" and "_alldirs" in self.__dict__:
self._alldirs.addpath(f) self._alldirs.addpath(f)
self._map[f] = dirstatetuple(state, mode, size, mtime) self._map[f] = dirstatetuple(state, mode, size, mtime)
if state != b'n' or mtime == -1: if state != b'n' or mtime == AMBIGUOUS_TIME:
self.nonnormalset.add(f) self.nonnormalset.add(f)
if size == FROM_P2: if size == FROM_P2:
self.otherparentset.add(f) self.otherparentset.add(f)
def removefile(self, f, oldstate, size): def removefile(self, f, oldstate, size):
""" """
Mark a file as removed in the dirstate. Mark a file as removed in the dirstate.
self.filefoldmap.pop(normed, None) self.filefoldmap.pop(normed, None)
self.nonnormalset.discard(f) self.nonnormalset.discard(f)
return exists return exists
def clearambiguoustimes(self, files, now): def clearambiguoustimes(self, files, now):
for f in files: for f in files:
e = self.get(f) e = self.get(f)
if e is not None and e[0] == b'n' and e[3] == now: if e is not None and e[0] == b'n' and e[3] == now:
self._map[f] = dirstatetuple(e[0], e[1], e[2], -1) self._map[f] = dirstatetuple(e[0], e[1], e[2], AMBIGUOUS_TIME)
self.nonnormalset.add(f) self.nonnormalset.add(f)
def nonnormalentries(self): def nonnormalentries(self):
'''Compute the nonnormal dirstate entries from the dmap''' '''Compute the nonnormal dirstate entries from the dmap'''
try: try:
return parsers.nonnormalotherparententries(self._map) return parsers.nonnormalotherparententries(self._map)
except AttributeError: except AttributeError:
nonnorm = set() nonnorm = set()
otherparent = set() otherparent = set()
for fname, e in pycompat.iteritems(self._map): for fname, e in pycompat.iteritems(self._map):
if e[0] != b'n' or e[3] == -1: if e[0] != b'n' or e[3] == AMBIGUOUS_TIME:
nonnorm.add(fname) nonnorm.add(fname)
if e[0] == b'n' and e[2] == FROM_P2: if e[0] == b'n' and e[2] == FROM_P2:
otherparent.add(fname) otherparent.add(fname)
return nonnorm, otherparent return nonnorm, otherparent
@propertycache @propertycache
def filefoldmap(self): def filefoldmap(self):
"""Returns a dictionary mapping normalized case paths to their """Returns a dictionary mapping normalized case paths to their