--- a/mercurial/revset.py Mon Jan 21 15:29:14 2019 +0000
+++ b/mercurial/revset.py Fri Jan 25 23:36:23 2019 -0800
@@ -471,7 +471,7 @@
try:
r = cl.parentrevs(r)[0]
except error.WdirUnsupported:
- r = repo[r].parents()[0].rev()
+ r = repo[r].p1().rev()
ps.add(r)
return subset & ps
@@ -1572,7 +1572,7 @@
try:
ps.add(cl.parentrevs(r)[0])
except error.WdirUnsupported:
- ps.add(repo[r].parents()[0].rev())
+ ps.add(repo[r].p1().rev())
ps -= {node.nullrev}
# XXX we should turn this into a baseset instead of a set, smartset may do
# some optimizations from the fact this is a baseset.
@@ -1691,7 +1691,7 @@
try:
ps.add(cl.parentrevs(r)[0])
except error.WdirUnsupported:
- ps.add(repo[r].parents()[0].rev())
+ ps.add(repo[r].p1().rev())
else:
try:
parents = cl.parentrevs(r)