Mercurial > hg
comparison mercurial/dirstatemap.py @ 47899:625b6ddb828c
dirstatemap: use the default code to handle "possibly_dirty" case
This case is quite simple too
Differential Revision: https://phab.mercurial-scm.org/D11324
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 16 Jul 2021 17:10:52 +0200 |
| parents | 442711f2c447 |
| children | 40cf4b278f8f |
comparison
equal
deleted
inserted
replaced
| 47898:442711f2c447 | 47899:625b6ddb828c |
|---|---|
| 296 return | 296 return |
| 297 elif not p1_tracked and p2_tracked and wc_tracked: | 297 elif not p1_tracked and p2_tracked and wc_tracked: |
| 298 self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty) | 298 self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty) |
| 299 return | 299 return |
| 300 elif possibly_dirty: | 300 elif possibly_dirty: |
| 301 self.addfile(filename, possibly_dirty=possibly_dirty) | 301 pass |
| 302 return | |
| 303 elif wc_tracked: | 302 elif wc_tracked: |
| 304 # this is a "normal" file | 303 # this is a "normal" file |
| 305 if parentfiledata is None: | 304 if parentfiledata is None: |
| 306 msg = b'failed to pass parentfiledata for a normal file: %s' | 305 msg = b'failed to pass parentfiledata for a normal file: %s' |
| 307 msg %= filename | 306 msg %= filename |