Mercurial > hg-stable
changeset 18011:4908197d7422
clfilter: mq should not warn about filtered mq patches
MQ warns when qstatus contains unknown nodes. With changelog filtering,
a node may be unknown because it is filtered. Thus, an unfiltered repo
is used for this check.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Mon, 08 Oct 2012 20:01:40 +0200 |
| parents | 38b51a60a195 |
| children | 848c428bb5ee |
| files | hgext/mq.py |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Mon Oct 08 18:02:25 2012 +0200 +++ b/hgext/mq.py Mon Oct 08 20:01:40 2012 +0200 @@ -3453,7 +3453,8 @@ mqtags = [(patch.node, patch.name) for patch in q.applied] try: - self.changelog.rev(mqtags[-1][0]) + # for now ignore filtering business + self.unfiltered().changelog.rev(mqtags[-1][0]) except error.LookupError: self.ui.warn(_('mq status file refers to unknown node %s\n') % short(mqtags[-1][0])) @@ -3483,7 +3484,7 @@ else: qbasenode = q.applied[0].node try: - qbase = cl.rev(qbasenode) + qbase = self.unfiltered().changelog.rev(qbasenode) except error.LookupError: self.ui.warn(_('mq status file refers to unknown node %s\n') % short(qbasenode))