diff -r 23c4589fc678 -r 4f703dcc626f mercurial/revset.py --- a/mercurial/revset.py Sat Aug 08 14:42:27 2015 +0800 +++ b/mercurial/revset.py Sun Aug 09 16:06:36 2015 +0900 @@ -2245,8 +2245,10 @@ # (::x and not ::y)/(not ::y and ::x) have a fast path def isonly(revs, bases): return ( - revs[0] == 'func' + revs is not None + and revs[0] == 'func' and getstring(revs[1], _('not a symbol')) == 'ancestors' + and bases is not None and bases[0] == 'not' and bases[1][0] == 'func' and getstring(bases[1][1], _('not a symbol')) == 'ancestors')