equal
deleted
inserted
replaced
3467 else: |
3467 else: |
3468 tags[patch[1]] = patch[0] |
3468 tags[patch[1]] = patch[0] |
3469 |
3469 |
3470 return result |
3470 return result |
3471 |
3471 |
3472 def _cacheabletip(self): |
|
3473 q = self.mq |
|
3474 cl = self.changelog |
|
3475 qbase = None |
|
3476 if not q.applied: |
|
3477 if getattr(self, '_committingpatch', False): |
|
3478 # Committing a new patch, must be tip |
|
3479 qbase = len(cl) - 1 |
|
3480 else: |
|
3481 qbasenode = q.applied[0].node |
|
3482 try: |
|
3483 qbase = self.unfiltered().changelog.rev(qbasenode) |
|
3484 except error.LookupError: |
|
3485 self.ui.warn(_('mq status file refers to unknown node %s\n') |
|
3486 % short(qbasenode)) |
|
3487 ret = super(mqrepo, self)._cacheabletip() |
|
3488 if qbase is not None: |
|
3489 ret = min(qbase - 1, ret) |
|
3490 return ret |
|
3491 |
|
3492 if repo.local(): |
3472 if repo.local(): |
3493 repo.__class__ = mqrepo |
3473 repo.__class__ = mqrepo |
3494 |
3474 |
3495 repo._phasedefaults.append(mqphasedefaults) |
3475 repo._phasedefaults.append(mqphasedefaults) |
3496 |
3476 |