equal
deleted
inserted
replaced
359 This property seems like an abstraction leakage and should probably be |
359 This property seems like an abstraction leakage and should probably be |
360 dealt in this class (or maybe the dirstatemap) directly. |
360 dealt in this class (or maybe the dirstatemap) directly. |
361 """ |
361 """ |
362 return self.removed and self._merged |
362 return self.removed and self._merged |
363 |
363 |
364 @property |
|
365 def dm_nonnormal(self): |
|
366 """True is the entry is non-normal in the dirstatemap sense |
|
367 |
|
368 There is no reason for any code, but the dirstatemap one to use this. |
|
369 """ |
|
370 return self.v1_state() != b'n' or self.v1_mtime() == AMBIGUOUS_TIME |
|
371 |
|
372 @property |
|
373 def dm_otherparent(self): |
|
374 """True is the entry is `otherparent` in the dirstatemap sense |
|
375 |
|
376 There is no reason for any code, but the dirstatemap one to use this. |
|
377 """ |
|
378 return self.v1_size() == FROM_P2 |
|
379 |
|
380 def v1_state(self): |
364 def v1_state(self): |
381 """return a "state" suitable for v1 serialization""" |
365 """return a "state" suitable for v1 serialization""" |
382 if not (self._p1_tracked or self._p2_tracked or self._wc_tracked): |
366 if not (self._p1_tracked or self._p2_tracked or self._wc_tracked): |
383 # the object has no state to record, this is -currently- |
367 # the object has no state to record, this is -currently- |
384 # unsupported |
368 # unsupported |