Mercurial > hg
comparison mercurial/dirstatemap.py @ 47528:80617f3c0f9a
dirstate: infer the 'n' state from `possibly_dirty`
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/D10970
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 04 Jul 2021 01:57:28 +0200 |
parents | c6b91a9c242a |
children | d3cf20328abd |
comparison
equal
deleted
inserted
replaced
47527:c6b91a9c242a | 47528:80617f3c0f9a |
---|---|
173 elif from_p2: | 173 elif from_p2: |
174 assert not possibly_dirty | 174 assert not possibly_dirty |
175 size = FROM_P2 | 175 size = FROM_P2 |
176 mtime = AMBIGUOUS_TIME | 176 mtime = AMBIGUOUS_TIME |
177 elif possibly_dirty: | 177 elif possibly_dirty: |
178 state = b'n' | |
178 size = NONNORMAL | 179 size = NONNORMAL |
179 mtime = AMBIGUOUS_TIME | 180 mtime = AMBIGUOUS_TIME |
180 else: | 181 else: |
181 assert state != b'a' | 182 assert state != b'a' |
182 assert size != FROM_P2 | 183 assert size != FROM_P2 |