Steve Borho committed 15f37a8

commit: proper method for discovering parent of qtip

Fixes #163

Comments (0)

Files changed (2)


     def shelvefunc(ui, repo, message, match, opts):
         # If an MQ patch is applied, consider all qdiff changes
         if hasattr(repo, 'mq') and
-            basenode = repo.lookup(-3)
+            qtip = repo[None].parents()[0]
+            basenode = qtip.parents()[0].node()
             basenode = repo.dirstate.parents()[0]
         if self.mqmode and self.mode != 'status':
             # when a patch is applied, show diffs to parent of top patch
-            n1, n2 = repo.lookup(-3), None
+            qtip = repo[None].parents()[0]
+            n1 = qtip.parents()[0].node()
+            n2 = None
             # node2 is None (the working dir) when 0 or 1 rev is specificed
             n1, n2 = cmdutil.revpair(repo, self.opts.get('rev'))
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.