Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dirstatemap.py @ 47525:fe4641cf9b72
dirstate: use a `added` parameter to _addpath
My next target are the explicit `state` byte, so let start with abstracting
their initial storage.
Differential Revision: https://phab.mercurial-scm.org/D10967
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 04 Jul 2021 01:42:10 +0200 |
| parents | 69a463a4f193 |
| children | c6b91a9c242a |
line wrap: on
line diff
--- a/mercurial/dirstatemap.py Sat Jul 03 20:59:26 2021 +0200 +++ b/mercurial/dirstatemap.py Sun Jul 04 01:42:10 2021 +0200 @@ -147,17 +147,19 @@ def addfile( self, f, - state, - mode, + state=None, + mode=0, size=None, mtime=None, + added=False, from_p2=False, possibly_dirty=False, ): """Add a tracked file to the dirstate.""" - if state == b'a': + if added: assert not possibly_dirty assert not from_p2 + state = b'a' size = NONNORMAL mtime = AMBIGUOUS_TIME elif from_p2: @@ -168,10 +170,12 @@ size = NONNORMAL mtime = AMBIGUOUS_TIME else: + assert state != b'a' assert size != FROM_P2 assert size != NONNORMAL size = size & rangemask mtime = mtime & rangemask + assert state is not None assert size is not None assert mtime is not None old_entry = self.get(f) @@ -461,10 +465,11 @@ def addfile( self, f, - state, - mode, + state=None, + mode=0, size=None, mtime=None, + added=False, from_p2=False, possibly_dirty=False, ): @@ -474,6 +479,7 @@ mode, size, mtime, + added, from_p2, possibly_dirty, )