[PATCH 1 of 5] scmutil: skip checks in "casecollisionauditor" if filename is already checked
FUJIWARA Katsunori
foozy at lares.dti.ne.jp
Mon Nov 11 09:15:56 CST 2013
# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1384182443 -32400
# Tue Nov 12 00:07:23 2013 +0900
# Node ID 2558f01d2f7f2a118679f1ee68a743543039aff8
# Parent c38c3fdc8b9317ba09e03ab09364c3800da7c50c
scmutil: skip checks in "casecollisionauditor" if filename is already checked
Before this patch, almost all of check code in
"casecollisionauditor.__call__()" is executed, even if specified
filename is already checked, because "f in self._newfiles" is examined
lastly.
In addition to it, adding "fl" to "self._loweredfiles" and "f" to
"self._newfiles" are also redundant in such case.
This patch checks "f in self._newfiles" first, and returns immediately
to avoid execution of check code for efficiency.
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -97,9 +97,10 @@
self._newfiles = set()
def __call__(self, f):
+ if f in self._newfiles:
+ return
fl = encoding.lower(f)
- if (fl in self._loweredfiles and f not in self._dirstate and
- f not in self._newfiles):
+ if fl in self._loweredfiles and f not in self._dirstate:
msg = _('possible case-folding collision for %s') % f
if self._abort:
raise util.Abort(msg)
More information about the Mercurial-devel
mailing list