Mercurial > public > mercurial-scm > hg-stable
diff mercurial/revset.py @ 32442:e8c043375b53
revset: make `hg log -r 'wdir()^'` work (issue4905)
This patch catches the WdirUnsupported exception to support wdir()^.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 19 May 2017 20:06:45 +0530 |
parents | bd872f64a8ba |
children | bb5dc19484b8 |
line wrap: on
line diff
--- 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.