log: simplify 'x or ancestors(x)' expression

'ancestors(x)' includes 'x'.

mercurial/cmdutil.py

@@ -2352,7 +2352,7 b' 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 '),
 }
 

tests/test-glog.t

@@ -1573,34 +1573,24 b' 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'))))
   <filteredset
     <filteredset
       <spanset- 0:37>,
       <not
-        <addset
-          <baseset [31]>,
-          <filteredset
-            <spanset- 0:37>,
-            <generatorsetdesc+>>>>>,
-    <not
-      <addset
-        <baseset [32]>,
         <filteredset
           <spanset- 0:37>,
-          <generatorsetdesc+>>>>>
+          <generatorsetdesc+>>>>,
+    <not
+      <filteredset
+        <spanset- 0:37>,
+        <generatorsetdesc+>>>>
 
 Dedicated repo for --follow and paths filtering. The g is crafted to
 have 2 filelog topological heads in a linear changeset graph.