Mercurial > hg
comparison mercurial/dirstatemap.py @ 47513:10e740292dff
dirstate-entry: add a `merged` property
Lets start to define and use more semantic property.
Differential Revision: https://phab.mercurial-scm.org/D10955
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 03 Jul 2021 04:07:21 +0200 |
| parents | eaae39894312 |
| children | 559aee84b889 |
comparison
equal
deleted
inserted
replaced
| 47512:769037a279ec | 47513:10e740292dff |
|---|---|
| 169 # during a merge. So I (marmoute) am not sure we need the | 169 # during a merge. So I (marmoute) am not sure we need the |
| 170 # conditionnal at all. Adding double checking this with assert | 170 # conditionnal at all. Adding double checking this with assert |
| 171 # would be nice. | 171 # would be nice. |
| 172 if entry is not None: | 172 if entry is not None: |
| 173 # backup the previous state | 173 # backup the previous state |
| 174 if entry[0] == b'm': # merge | 174 if entry.merged: # merge |
| 175 size = NONNORMAL | 175 size = NONNORMAL |
| 176 elif entry[0] == b'n' and entry[2] == FROM_P2: # other parent | 176 elif entry[0] == b'n' and entry[2] == FROM_P2: # other parent |
| 177 size = FROM_P2 | 177 size = FROM_P2 |
| 178 self.otherparentset.add(f) | 178 self.otherparentset.add(f) |
| 179 if size == 0: | 179 if size == 0: |