Mercurial > public > mercurial-scm > hg
diff mercurial/dirstatemap.py @ 48138:38488d488ec1
dirstate-item: change the internal storage and constructor value
This should be closer to what we do need and what we can actually reliably
record.
In practice it means that we abandon the prospect of storing much more refined
data for now. We don't have the necessary information nor code using it right
now. So it seems safer to just use a clearer version of what we had so far.
See the documentation changes for details.
Differential Revision: https://phab.mercurial-scm.org/D11557
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 01 Oct 2021 20:35:30 +0200 |
| parents | 25836b0029f5 |
| children | 98b3eb6c1479 |
line wrap: on
line diff
--- a/mercurial/dirstatemap.py Sat Oct 02 11:39:57 2021 +0200 +++ b/mercurial/dirstatemap.py Fri Oct 01 20:35:30 2021 +0200 @@ -137,14 +137,7 @@ if entry is None: self._dirs_incr(filename) entry = DirstateItem( - p1_tracked=False, - p2_tracked=False, wc_tracked=True, - merged=False, - clean_p1=False, - clean_p2=False, - possibly_dirty=False, - parentfiledata=None, ) self._insert_entry(filename, entry) @@ -208,37 +201,20 @@ self._drop_entry(filename) self._dirs_decr(filename, old_entry=old_entry) return - elif merged: - pass - elif not (p1_tracked or p2_tracked) and wc_tracked: - pass # file is added, nothing special to adjust - elif (p1_tracked or p2_tracked) and not wc_tracked: - pass - elif clean_p2 and wc_tracked: - pass - elif not p1_tracked and p2_tracked and wc_tracked: - clean_p2 = True - elif possibly_dirty: - pass - elif wc_tracked: - # this is a "normal" file - if parentfiledata is None: - msg = b'failed to pass parentfiledata for a normal file: %s' - msg %= filename - raise error.ProgrammingError(msg) - else: - assert False, 'unreachable' + + p2_info = merged or clean_p2 + if merged: + assert p1_tracked + + has_meaningful_mtime = not possibly_dirty old_entry = self._map.get(filename) self._dirs_incr(filename, old_entry) entry = DirstateItem( wc_tracked=wc_tracked, p1_tracked=p1_tracked, - p2_tracked=p2_tracked, - merged=merged, - clean_p1=clean_p1, - clean_p2=clean_p2, - possibly_dirty=possibly_dirty, + p2_info=p2_info, + has_meaningful_mtime=has_meaningful_mtime, parentfiledata=parentfiledata, ) self._insert_entry(filename, entry)