Show More
@@ -3469,26 +3469,6 b' def reposetup(ui, repo):' | |||||
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 |
@@ -61,7 +61,6 b' test corrupt status file' | |||||
61 | patch queue now empty |
|
61 | patch queue now empty | |
62 | $ cp .hg/patches/status.orig .hg/patches/status |
|
62 | $ cp .hg/patches/status.orig .hg/patches/status | |
63 | $ hg qpush |
|
63 | $ hg qpush | |
64 | mq status file refers to unknown node * (glob) |
|
|||
65 | abort: working directory revision is not qtip |
|
64 | abort: working directory revision is not qtip | |
66 | [255] |
|
65 | [255] | |
67 | $ rm .hg/patches/status .hg/patches/status.orig |
|
66 | $ rm .hg/patches/status .hg/patches/status.orig |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now