Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dirstatemap.py @ 47527:c6b91a9c242a
dirstate: use a `merged` parameter to _addpath
Differential Revision: https://phab.mercurial-scm.org/D10969
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 04 Jul 2021 01:48:11 +0200 |
| parents | fe4641cf9b72 |
| children | 80617f3c0f9a |
line wrap: on
line diff
--- a/mercurial/dirstatemap.py Sun Jul 04 01:44:43 2021 +0200 +++ b/mercurial/dirstatemap.py Sun Jul 04 01:48:11 2021 +0200 @@ -152,16 +152,24 @@ size=None, mtime=None, added=False, + merged=False, from_p2=False, possibly_dirty=False, ): """Add a tracked file to the dirstate.""" if added: + assert not merged assert not possibly_dirty assert not from_p2 state = b'a' size = NONNORMAL mtime = AMBIGUOUS_TIME + elif merged: + assert not possibly_dirty + assert not from_p2 + state = b'm' + size = FROM_P2 + mtime = AMBIGUOUS_TIME elif from_p2: assert not possibly_dirty size = FROM_P2 @@ -470,6 +478,7 @@ size=None, mtime=None, added=False, + merged=False, from_p2=False, possibly_dirty=False, ): @@ -480,6 +489,7 @@ size, mtime, added, + merged, from_p2, possibly_dirty, )