Mercurial > public > mercurial-scm > hg
comparison mercurial/pure/parsers.py @ 48152:8f88307f8e07
dirstate-item: replace another usage of `merged`
We simply spell out the logic here. This was the last usage of `merged`.
Differential Revision: https://phab.mercurial-scm.org/D11596
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 01 Oct 2021 03:29:33 +0200 |
| parents | d71feb05d5b6 |
| children | c29d312657d2 |
comparison
equal
deleted
inserted
replaced
| 48151:e0b4e4f80fff | 48152:8f88307f8e07 |
|---|---|
| 332 # the object has no state to record, this is -currently- | 332 # the object has no state to record, this is -currently- |
| 333 # unsupported | 333 # unsupported |
| 334 raise RuntimeError('untracked item') | 334 raise RuntimeError('untracked item') |
| 335 elif self.removed: | 335 elif self.removed: |
| 336 return b'r' | 336 return b'r' |
| 337 elif self.merged: | 337 elif self._p1_tracked and self._p2_info: |
| 338 return b'm' | 338 return b'm' |
| 339 elif self.added: | 339 elif self.added: |
| 340 return b'a' | 340 return b'a' |
| 341 else: | 341 else: |
| 342 return b'n' | 342 return b'n' |