--- a/mercurial/dirstate.py Sun Feb 19 18:59:20 2006 +0100
+++ b/mercurial/dirstate.py Sun Feb 19 19:43:03 2006 +0100
@@ -270,11 +270,11 @@
elif not dc:
dc = self.filterfiles(files)
- def statmatch(file, stat):
- file = util.pconvert(file)
- if file not in dc and self.ignore(file):
+ def statmatch(file_, stat):
+ file_ = util.pconvert(file_)
+ if file_ not in dc and self.ignore(file_):
return False
- return match(file)
+ return match(file_)
return self.walkhelper(files=files, statmatch=statmatch, dc=dc)
@@ -350,9 +350,9 @@
continue
if stat.S_ISDIR(st.st_mode):
cmp1 = (lambda x, y: cmp(x[1], y[1]))
- sorted = [ x for x in findfiles(f) ]
- sorted.sort(cmp1)
- for e in sorted:
+ sorted_ = [ x for x in findfiles(f) ]
+ sorted_.sort(cmp1)
+ for e in sorted_:
yield e
else:
ff = util.normpath(ff)
@@ -380,7 +380,7 @@
for src, fn, st in self.statwalk(files, match):
try:
- type, mode, size, time = self[fn]
+ type_, mode, size, time = self[fn]
except KeyError:
unknown.append(fn)
continue
@@ -399,22 +399,22 @@
nonexistent = False
# XXX: what to do with file no longer present in the fs
# who are not removed in the dirstate ?
- if nonexistent and type in "nm":
+ if nonexistent and type_ in "nm":
deleted.append(fn)
continue
# check the common case first
- if type == 'n':
+ if type_ == 'n':
if not st:
st = os.stat(fn)
if size != st.st_size or (mode ^ st.st_mode) & 0100:
modified.append(fn)
elif time != st.st_mtime:
lookup.append(fn)
- elif type == 'm':
+ elif type_ == 'm':
modified.append(fn)
- elif type == 'a':
+ elif type_ == 'a':
added.append(fn)
- elif type == 'r':
+ elif type_ == 'r':
removed.append(fn)
return (lookup, modified, added, removed, deleted, unknown)