[PATCH] log: make "slowpath" condition slightly more readable
Yuya Nishihara
yuya at tcha.org
Tue Dec 19 14:37:54 UTC 2017
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1513687299 -32400
# Tue Dec 19 21:41:39 2017 +0900
# Node ID 2ce83446b12b43dfeddf1c0aadb5c8753047797a
# Parent c836f3fd99ec97b248434e1523c73d77066c1d43
log: make "slowpath" condition slightly more readable
Before 8e0e334bad42 and 6c76c42a5893, the condition was "anypats() or
(files() and --removed)". This can be read as "<match is actually slow>
or <walk files including removed revs>". So "not always()" (i.e. walk
file revs) seems more appropriate here.
The logic should be unchanged:
not anypats() => always() or isexact() or prefix()
isexact() => not always()
prefix() => not always()
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -2193,8 +2193,7 @@ def walkchangerevs(repo, match, opts, pr
if not revs:
return []
wanted = set()
- slowpath = match.anypats() or ((match.isexact() or match.prefix()) and
- opts.get('removed'))
+ slowpath = match.anypats() or (not match.always() and opts.get('removed'))
fncache = {}
change = repo.changectx
@@ -2390,8 +2389,7 @@ def _makelogrevset(repo, pats, opts, rev
# platforms without shell expansion (windows).
wctx = repo[None]
match, pats = scmutil.matchandpats(wctx, pats, opts)
- slowpath = match.anypats() or ((match.isexact() or match.prefix()) and
- opts.get('removed'))
+ slowpath = match.anypats() or (not match.always() and opts.get('removed'))
if not slowpath:
for f in match.files():
if follow and f not in wctx:
More information about the Mercurial-devel
mailing list