Show More
@@ -354,32 +354,22 b' class DirstateItem(object):' | |||
|
354 | 354 | # the object has no state to record, this is -currently- |
|
355 | 355 | # unsupported |
|
356 | 356 | raise RuntimeError('untracked item') |
|
357 |
elif |
|
|
358 | # File was deleted | |
|
359 |
|
|
|
360 | return NONNORMAL | |
|
361 | elif self._clean_p2: | |
|
362 | return FROM_P2 | |
|
363 | else: | |
|
364 | return 0 | |
|
365 | elif self._merged: | |
|
357 | elif self.merged_removed: | |
|
358 | return NONNORMAL | |
|
359 | elif self.from_p2_removed: | |
|
366 | 360 | return FROM_P2 |
|
367 | elif not (self._p1_tracked or self._p2_tracked) and self._wc_tracked: | |
|
368 |
|
|
|
361 | elif self.removed: | |
|
362 | return 0 | |
|
363 | elif self.merged: | |
|
364 | return FROM_P2 | |
|
365 | elif self.added: | |
|
369 | 366 | return NONNORMAL |
|
370 | elif self._clean_p2 and self._wc_tracked: | |
|
371 | return FROM_P2 | |
|
372 | elif not self._p1_tracked and self._p2_tracked and self._wc_tracked: | |
|
367 | elif self.from_p2: | |
|
373 | 368 | return FROM_P2 |
|
374 | 369 | elif self._possibly_dirty: |
|
375 |
if self._size is None |
|
|
376 | return NONNORMAL | |
|
377 | else: | |
|
378 | return self._size | |
|
379 | elif self._wc_tracked: | |
|
370 | return self._size if self._size is not None else NONNORMAL | |
|
371 | else: | |
|
380 | 372 | return self._size |
|
381 | else: | |
|
382 | raise RuntimeError('unreachable') | |
|
383 | 373 | |
|
384 | 374 | def v1_mtime(self): |
|
385 | 375 | """return a "mtime" suitable for v1 serialization""" |
General Comments 0
You need to be logged in to leave comments.
Login now