equal
deleted
inserted
replaced
337 if not self._wc_tracked: |
337 if not self._wc_tracked: |
338 return False |
338 return False |
339 return self._clean_p2 |
339 return self._clean_p2 |
340 |
340 |
341 @property |
341 @property |
342 def from_p2_removed(self): |
|
343 """True if the file has been removed, but was "from_p2" initially |
|
344 |
|
345 This property seems like an abstraction leakage and should probably be |
|
346 dealt in this class (or maybe the dirstatemap) directly. |
|
347 """ |
|
348 return self.removed and self._clean_p2 |
|
349 |
|
350 @property |
|
351 def removed(self): |
342 def removed(self): |
352 """True if the file has been removed""" |
343 """True if the file has been removed""" |
353 return not self._wc_tracked and (self._p1_tracked or self._p2_tracked) |
344 return not self._wc_tracked and (self._p1_tracked or self._p2_tracked) |
354 |
345 |
355 def v1_state(self): |
346 def v1_state(self): |