equal
deleted
inserted
replaced
312 See the class documentation for details. |
312 See the class documentation for details. |
313 """ |
313 """ |
314 return self._wc_tracked and self._p2_info |
314 return self._wc_tracked and self._p2_info |
315 |
315 |
316 @property |
316 @property |
317 def merged(self): |
|
318 """True if the file has been merged |
|
319 |
|
320 Should only be set if a merge is in progress in the dirstate |
|
321 """ |
|
322 return self._wc_tracked and self._p1_tracked and self._p2_info |
|
323 |
|
324 @property |
|
325 def removed(self): |
317 def removed(self): |
326 """True if the file has been removed""" |
318 """True if the file has been removed""" |
327 return not self._wc_tracked and (self._p1_tracked or self._p2_info) |
319 return not self._wc_tracked and (self._p1_tracked or self._p2_info) |
328 |
320 |
329 def v1_state(self): |
321 def v1_state(self): |