# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1358208312 -3600
# Node ID cfa731b45b75073562dcf7223f48655fcd3ead6f
# Parent  de99de39ba28857437025f9b05d18f8b37cd800e
mq: checktoppatch should only check if p1 is qtip

There is no way qtip in p2 could be used for anything, and there is thus no
reason to check and accept it.

diff -r de99de39ba28 -r cfa731b45b75 hgext/mq.py
--- a/hgext/mq.py	Tue Jan 15 01:05:12 2013 +0100
+++ b/hgext/mq.py	Tue Jan 15 01:05:12 2013 +0100
@@ -929,11 +929,11 @@
         self._cleanup(realpatches, numrevs, opts.get('keep'))
 
     def checktoppatch(self, repo):
+        '''check that working directory is at qtip'''
         if self.applied:
             top = self.applied[-1].node
             patch = self.applied[-1].name
-            pp = repo.dirstate.parents()
-            if top not in pp:
+            if repo.dirstate.p1() != top:
                 raise util.Abort(_("working directory revision is not qtip"))
             return top, patch
         return None, None