# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1380109303 -7200
# Node ID f72b513ad234a3c3e56b025a6e7febbb0e3cc828
# Parent  e67786965af23b920548ed4e880fcd897a30c36d
mq: drop the use of mq.queue.qparent in mq.queue.strip

Same as in the previous changeset, rev is never `None`. We can just copy the two
relevant lines in in `queue.strip`. This help having `queue.strip` independent
from `queue`. One further step toward the extraction of `strip` in an independent
extension. (As discussed in issue3824).

diff -r e67786965af2 -r f72b513ad234 hgext/mq.py
--- a/hgext/mq.py	Wed Sep 25 14:10:34 2013 +0200
+++ b/hgext/mq.py	Wed Sep 25 13:41:43 2013 +0200
@@ -1111,7 +1111,9 @@
 
             if update:
                 checklocalchanges(repo, force=force)
-                urev = self.qparents(repo, revs[0])
+                urev, p2 = repo.changelog.parents(revs[0])
+                if p2 != nullid and p2 in [x.node for x in self.applied]:
+                    urev = p2
                 hg.clean(repo, urev)
                 repo.dirstate.write()