##// END OF EJS Templates
cleanup: fix leakage of dirstate._map to client code...
Augie Fackler -
r43196:34ed651b default
parent child Browse files
Show More
@@ -234,7 +234,7 b' def reposetup(ui, repo):'
234 result[2] = [f for f in result[2]
234 result[2] = [f for f in result[2]
235 if f not in lfdirstate]
235 if f not in lfdirstate]
236
236
237 lfiles = set(lfdirstate._map)
237 lfiles = set(lfdirstate)
238 # Unknown files
238 # Unknown files
239 result[4] = set(result[4]).difference(lfiles)
239 result[4] = set(result[4]).difference(lfiles)
240 # Ignored files
240 # Ignored files
@@ -751,7 +751,7 b' def debugstate(ui, repo, **opts):'
751 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
751 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
752 else:
752 else:
753 keyfunc = None # sort by filename
753 keyfunc = None # sort by filename
754 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
754 for file_, ent in sorted(repo.dirstate.iteritems(), key=keyfunc):
755 if ent[3] == -1:
755 if ent[3] == -1:
756 timestr = 'unset '
756 timestr = 'unset '
757 elif nodates:
757 elif nodates:
@@ -319,7 +319,7 b' class casecollisionauditor(object):'
319 def __init__(self, ui, abort, dirstate):
319 def __init__(self, ui, abort, dirstate):
320 self._ui = ui
320 self._ui = ui
321 self._abort = abort
321 self._abort = abort
322 allfiles = '\0'.join(dirstate._map)
322 allfiles = '\0'.join(dirstate)
323 self._loweredfiles = set(encoding.lower(allfiles).split('\0'))
323 self._loweredfiles = set(encoding.lower(allfiles).split('\0'))
324 self._dirstate = dirstate
324 self._dirstate = dirstate
325 # The purpose of _newfiles is so that we don't complain about
325 # The purpose of _newfiles is so that we don't complain about
General Comments 0
You need to be logged in to leave comments. Login now