# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1495204605 -19800 # Node ID e8c043375b53b30c4b468687f08323cbeeb452ef # Parent a28c76e1cea98c3f7ac227dbd9853844132e6165 revset: make `hg log -r 'wdir()^'` work (issue4905) This patch catches the WdirUnsupported exception to support wdir()^. diff -r a28c76e1cea9 -r e8c043375b53 mercurial/revset.py --- a/mercurial/revset.py Fri May 19 19:12:06 2017 +0530 +++ b/mercurial/revset.py Fri May 19 20:06:45 2017 +0530 @@ -1408,7 +1408,10 @@ ps = set() cl = repo.changelog for r in getset(repo, fullreposet(repo), x): - ps.add(cl.parentrevs(r)[0]) + try: + ps.add(cl.parentrevs(r)[0]) + except error.WdirUnsupported: + ps.add(repo[r].parents()[0].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. diff -r a28c76e1cea9 -r e8c043375b53 tests/test-revset.t --- a/tests/test-revset.t Fri May 19 19:12:06 2017 +0530 +++ b/tests/test-revset.t Fri May 19 20:06:45 2017 +0530 @@ -1221,6 +1221,15 @@ Test working-directory revision $ hg debugrevspec 'wdir()' 2147483647 + $ hg debugrevspec 'wdir()^' + 9 + $ hg up 7 + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg debugrevspec 'wdir()^' + 7 +For tests consistency + $ hg up 9 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg debugrevspec 'tip or wdir()' 9 2147483647