Show More
@@ -335,22 +335,14 b' class DirstateItem(object):' | |||
|
335 | 335 | # the object has no state to record, this is -currently- |
|
336 | 336 | # unsupported |
|
337 | 337 | raise RuntimeError('untracked item') |
|
338 |
elif |
|
|
338 | elif self.removed: | |
|
339 | 339 | return b'r' |
|
340 |
elif self. |
|
|
340 | elif self.merged: | |
|
341 | 341 | return b'm' |
|
342 | elif not (self._p1_tracked or self._p2_tracked) and self._wc_tracked: | |
|
342 | elif self.added: | |
|
343 | 343 | return b'a' |
|
344 | elif self._clean_p2 and self._wc_tracked: | |
|
344 | else: | |
|
345 | 345 | return b'n' |
|
346 | elif not self._p1_tracked and self._p2_tracked and self._wc_tracked: | |
|
347 | return b'n' | |
|
348 | elif self._possibly_dirty: | |
|
349 | return b'n' | |
|
350 | elif self._wc_tracked: | |
|
351 | return b'n' | |
|
352 | else: | |
|
353 | raise RuntimeError('unreachable') | |
|
354 | 346 | |
|
355 | 347 | def v1_mode(self): |
|
356 | 348 | """return a "mode" suitable for v1 serialization""" |
General Comments 0
You need to be logged in to leave comments.
Login now