Mercurial > public > mercurial-scm > hg

diff hgext/mq.py @ 10362:2e3ec7ef5349

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: don't warn on qpush against a branch head
author Dirkjan Ochtman <djc.ochtman@kentyde.com>
date Sun, 07 Feb 2010 14:06:05 +0100
parents 49cd2e7fd91c
children f05e0d54f424
line wrap: on
line diff
--- a/hgext/mq.py	Sun Feb 07 13:49:52 2010 +0100
+++ b/hgext/mq.py	Sun Feb 07 14:06:05 2010 +0100
@@ -987,7 +987,12 @@
         diffopts = self.diffopts()
         wlock = repo.wlock()
         try:
-            if repo.dirstate.parents()[0] not in repo.heads():
+            heads = []
+            for b, ls in repo.branchmap().iteritems():
+                heads += ls
+            if not heads:
+                heads = [nullid]
+            if repo.dirstate.parents()[0] not in heads:
                 self.ui.status(_("(working directory not at a head)\n"))
 
             if not self.series: