diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -2352,7 +2352,7 @@ def _makenofollowlogfilematcher(repo, pa '_patsfollow': ('follow(%(val)r)', ' or '), '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '), 'keyword': ('keyword(%(val)r)', ' or '), - 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), + 'prune': ('not ancestors(%(val)r)', ' and '), 'user': ('user(%(val)r)', ' or '), } diff --git a/tests/test-glog.t b/tests/test-glog.t --- a/tests/test-glog.t +++ b/tests/test-glog.t @@ -1573,34 +1573,24 @@ glog always reorders nodes which explain [] (and (not - (or - (list - (string '31') - (func - (symbol 'ancestors') - (string '31'))))) + (func + (symbol 'ancestors') + (string '31'))) (not - (or - (list - (string '32') - (func - (symbol 'ancestors') - (string '32')))))) + (func + (symbol 'ancestors') + (string '32')))) , , - , - >>>>, - , , - >>>> + >>>, + , + >>> Dedicated repo for --follow and paths filtering. The g is crafted to have 2 filelog topological heads in a linear changeset graph.