Show More
@@ -377,25 +377,18 b' class DirstateItem(object):' | |||||
377 | # the object has no state to record, this is -currently- |
|
377 | # the object has no state to record, this is -currently- | |
378 | # unsupported |
|
378 | # unsupported | |
379 | raise RuntimeError('untracked item') |
|
379 | raise RuntimeError('untracked item') | |
380 |
elif |
|
380 | elif self.removed: | |
381 | return 0 |
|
381 | return 0 | |
382 | elif self._possibly_dirty: |
|
382 | elif self._possibly_dirty: | |
383 | return AMBIGUOUS_TIME |
|
383 | return AMBIGUOUS_TIME | |
384 |
elif self. |
|
384 | elif self.merged: | |
385 | return AMBIGUOUS_TIME |
|
|||
386 | elif not (self._p1_tracked or self._p2_tracked) and self._wc_tracked: |
|
|||
387 | return AMBIGUOUS_TIME |
|
385 | return AMBIGUOUS_TIME | |
388 |
elif self. |
|
386 | elif self.added: | |
389 | return AMBIGUOUS_TIME |
|
|||
390 | elif not self._p1_tracked and self._p2_tracked and self._wc_tracked: |
|
|||
391 | return AMBIGUOUS_TIME |
|
387 | return AMBIGUOUS_TIME | |
392 |
elif self. |
|
388 | elif self.from_p2: | |
393 | if self._mtime is None: |
|
389 | return AMBIGUOUS_TIME | |
394 | return 0 |
|
|||
395 | else: |
|
|||
396 | return self._mtime |
|
|||
397 | else: |
|
390 | else: | |
398 | raise RuntimeError('unreachable') |
|
391 | return self._mtime if self._mtime is not None else 0 | |
399 |
|
392 | |||
400 | def need_delay(self, now): |
|
393 | def need_delay(self, now): | |
401 | """True if the stored mtime would be ambiguous with the current time""" |
|
394 | """True if the stored mtime would be ambiguous with the current time""" |
General Comments 0
You need to be logged in to leave comments.
Login now