Mercurial > hg

comparison mercurial/dirstatemap.py @ 47529:d3cf20328abd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: infer the 'n' state from `from_p2` This flag is only used with 'n' so lets set the state based on that parameter in this case. Differential Revision: https://phab.mercurial-scm.org/D10971
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 04 Jul 2021 01:58:03 +0200
parents 80617f3c0f9a
children a1745a292885
comparison
equal deleted inserted replaced
47528:80617f3c0f9a 47529:d3cf20328abd
170 state = b'm' 170 state = b'm'
171 size = FROM_P2 171 size = FROM_P2
172 mtime = AMBIGUOUS_TIME 172 mtime = AMBIGUOUS_TIME
173 elif from_p2: 173 elif from_p2:
174 assert not possibly_dirty 174 assert not possibly_dirty
175 state = b'n'
175 size = FROM_P2 176 size = FROM_P2
176 mtime = AMBIGUOUS_TIME 177 mtime = AMBIGUOUS_TIME
177 elif possibly_dirty: 178 elif possibly_dirty:
178 state = b'n' 179 state = b'n'
179 size = NONNORMAL 180 size = NONNORMAL