dirstate.py
610 lines
| 18.6 KiB
| text/x-python
|
PythonLexer
/ mercurial / dirstate.py
Martin Geisler
|
r8226 | # dirstate.py - working directory tracking for mercurial | ||
# | ||||
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||||
# | ||||
# This software may be used and distributed according to the terms of the | ||||
# GNU General Public License version 2, incorporated herein by reference. | ||||
mpm@selenic.com
|
r1089 | |||
Joel Rosdahl
|
r6211 | from node import nullid | ||
Matt Mackall
|
r3891 | from i18n import _ | ||
Simon Heimberg
|
r8312 | import util, ignore, osutil, parsers | ||
import struct, os, stat, errno | ||||
import cStringIO, sys | ||||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r4610 | _unknown = ('?', 0, 0, 0) | ||
_format = ">cllll" | ||||
Matt Mackall
|
r8261 | propertycache = util.propertycache | ||
Matt Mackall
|
r4610 | |||
Matt Mackall
|
r6767 | def _finddirs(path): | ||
Matt Mackall
|
r7032 | pos = path.rfind('/') | ||
while pos != -1: | ||||
yield path[:pos] | ||||
Matt Mackall
|
r6767 | pos = path.rfind('/', 0, pos) | ||
Benoit Boissinot
|
r7096 | def _incdirs(dirs, path): | ||
for base in _finddirs(path): | ||||
if base in dirs: | ||||
dirs[base] += 1 | ||||
return | ||||
dirs[base] = 1 | ||||
def _decdirs(dirs, path): | ||||
for base in _finddirs(path): | ||||
if dirs[base] > 1: | ||||
dirs[base] -= 1 | ||||
return | ||||
del dirs[base] | ||||
Eric Hopper
|
r1559 | class dirstate(object): | ||
Benoit Boissinot
|
r2393 | |||
mpm@selenic.com
|
r1089 | def __init__(self, opener, ui, root): | ||
Matt Mackall
|
r4614 | self._opener = opener | ||
self._root = root | ||||
Benoit Boissinot
|
r6972 | self._rootdir = os.path.join(root, '') | ||
Matt Mackall
|
r4903 | self._dirty = False | ||
Matt Mackall
|
r4965 | self._dirtypl = False | ||
Matt Mackall
|
r4614 | self._ui = ui | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r8261 | @propertycache | ||
def _map(self): | ||||
self._read() | ||||
return self._map | ||||
@propertycache | ||||
def _copymap(self): | ||||
self._read() | ||||
return self._copymap | ||||
@propertycache | ||||
def _foldmap(self): | ||||
f = {} | ||||
for name in self._map: | ||||
f[os.path.normcase(name)] = name | ||||
return f | ||||
@propertycache | ||||
def _branch(self): | ||||
try: | ||||
return self._opener("branch").read().strip() or "default" | ||||
except IOError: | ||||
return "default" | ||||
@propertycache | ||||
def _pl(self): | ||||
try: | ||||
st = self._opener("dirstate").read(40) | ||||
if len(st) == 40: | ||||
return st[:20], st[20:40] | ||||
Matt Mackall
|
r8640 | if len(st) < 40: | ||
raise util.Abort(_('working directory state appears damaged!')) | ||||
Matt Mackall
|
r8261 | except IOError, err: | ||
if err.errno != errno.ENOENT: raise | ||||
return [nullid, nullid] | ||||
@propertycache | ||||
def _dirs(self): | ||||
dirs = {} | ||||
for f,s in self._map.iteritems(): | ||||
if s[0] != 'r': | ||||
_incdirs(dirs, f) | ||||
return dirs | ||||
@propertycache | ||||
def _ignore(self): | ||||
files = [self._join('.hgignore')] | ||||
for name, path in self._ui.configitems("ui"): | ||||
if name == 'ignore' or name.startswith('ignore.'): | ||||
files.append(os.path.expanduser(path)) | ||||
return ignore.ignore(self._root, files, self._ui.warn) | ||||
@propertycache | ||||
def _slash(self): | ||||
return self._ui.configbool('ui', 'slash') and os.sep != '/' | ||||
@propertycache | ||||
def _checklink(self): | ||||
return util.checklink(self._root) | ||||
@propertycache | ||||
def _checkexec(self): | ||||
return util.checkexec(self._root) | ||||
@propertycache | ||||
def _checkcase(self): | ||||
return not util.checkcase(self._join('.hg')) | ||||
@propertycache | ||||
def normalize(self): | ||||
if self._checkcase: | ||||
return self._normalize | ||||
return lambda x, y=False: x | ||||
Matt Mackall
|
r4603 | |||
Matt Mackall
|
r4905 | def _join(self, f): | ||
Benoit Boissinot
|
r6972 | # much faster than os.path.join() | ||
Benoit Boissinot
|
r6973 | # it's safe because f is always a relative path | ||
Benoit Boissinot
|
r6972 | return self._rootdir + f | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r6743 | def flagfunc(self, fallback): | ||
if self._checklink: | ||||
if self._checkexec: | ||||
def f(x): | ||||
Benoit Boissinot
|
r6972 | p = self._join(x) | ||
Matt Mackall
|
r6743 | if os.path.islink(p): | ||
return 'l' | ||||
if util.is_exec(p): | ||||
return 'x' | ||||
return '' | ||||
return f | ||||
def f(x): | ||||
Benoit Boissinot
|
r6972 | if os.path.islink(self._join(x)): | ||
Matt Mackall
|
r6743 | return 'l' | ||
if 'x' in fallback(x): | ||||
return 'x' | ||||
return '' | ||||
return f | ||||
if self._checkexec: | ||||
def f(x): | ||||
if 'l' in fallback(x): | ||||
return 'l' | ||||
Benoit Boissinot
|
r6972 | if util.is_exec(self._join(x)): | ||
Matt Mackall
|
r6743 | return 'x' | ||
return '' | ||||
return f | ||||
return fallback | ||||
mpm@selenic.com
|
r1089 | def getcwd(self): | ||
cwd = os.getcwd() | ||||
Matt Mackall
|
r4614 | if cwd == self._root: return '' | ||
# self._root ends with a path separator if self._root is '/' or 'C:\' | ||||
rootsep = self._root | ||||
Shun-ichi GOTO
|
r5843 | if not util.endswithsep(rootsep): | ||
Alexis S. L. Carvalho
|
r4230 | rootsep += os.sep | ||
if cwd.startswith(rootsep): | ||||
return cwd[len(rootsep):] | ||||
else: | ||||
# we're outside the repo. return an absolute path. | ||||
return cwd | ||||
mpm@selenic.com
|
r1089 | |||
Alexis S. L. Carvalho
|
r4525 | def pathto(self, f, cwd=None): | ||
if cwd is None: | ||||
cwd = self.getcwd() | ||||
Matt Mackall
|
r4614 | path = util.pathto(self._root, cwd, f) | ||
Alexis S. L. Carvalho
|
r4527 | if self._slash: | ||
Shun-ichi GOTO
|
r5842 | return util.normpath(path) | ||
Alexis S. L. Carvalho
|
r4527 | return path | ||
Alexis S. L. Carvalho
|
r4525 | |||
mpm@selenic.com
|
r1089 | def __getitem__(self, key): | ||
Matt Mackall
|
r4906 | ''' current states: | ||
n normal | ||||
m needs merging | ||||
r marked for removal | ||||
a marked for addition | ||||
? not tracked''' | ||||
return self._map.get(key, ("?",))[0] | ||||
mpm@selenic.com
|
r1089 | |||
def __contains__(self, key): | ||||
Matt Mackall
|
r4614 | return key in self._map | ||
def __iter__(self): | ||||
Matt Mackall
|
r8209 | for x in sorted(self._map): | ||
Matt Mackall
|
r4614 | yield x | ||
mpm@selenic.com
|
r1089 | |||
def parents(self): | ||||
Matt Mackall
|
r4614 | return self._pl | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r4179 | def branch(self): | ||
return self._branch | ||||
mpm@selenic.com
|
r1089 | def setparents(self, p1, p2=nullid): | ||
Matt Mackall
|
r4965 | self._dirty = self._dirtypl = True | ||
Matt Mackall
|
r4614 | self._pl = p1, p2 | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r4179 | def setbranch(self, branch): | ||
self._branch = branch | ||||
Matt Mackall
|
r4614 | self._opener("branch", "w").write(branch + '\n') | ||
Matt Mackall
|
r4179 | |||
Matt Mackall
|
r4615 | def _read(self): | ||
Matt Mackall
|
r4614 | self._map = {} | ||
self._copymap = {} | ||||
Matt Mackall
|
r4607 | try: | ||
Matt Mackall
|
r4614 | st = self._opener("dirstate").read() | ||
Matt Mackall
|
r4607 | except IOError, err: | ||
if err.errno != errno.ENOENT: raise | ||||
return | ||||
if not st: | ||||
return | ||||
Dirkjan Ochtman
|
r7128 | p = parsers.parse_dirstate(self._map, self._copymap, st) | ||
Alexis S. L. Carvalho
|
r4952 | if not self._dirtypl: | ||
Matt Mackall
|
r7093 | self._pl = p | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r4613 | def invalidate(self): | ||
Paul Moore
|
r6677 | for a in "_map _copymap _foldmap _branch _pl _dirs _ignore".split(): | ||
Alexis S. L. Carvalho
|
r4953 | if a in self.__dict__: | ||
delattr(self, a) | ||||
Matt Mackall
|
r4903 | self._dirty = False | ||
Bryan O'Sullivan
|
r4375 | |||
mpm@selenic.com
|
r1089 | def copy(self, source, dest): | ||
Patrick Mezard
|
r7566 | """Mark dest as a copy of source. Unmark dest if source is None. | ||
""" | ||||
Patrick Mezard
|
r6680 | if source == dest: | ||
return | ||||
Matt Mackall
|
r4903 | self._dirty = True | ||
Patrick Mezard
|
r7566 | if source is not None: | ||
self._copymap[dest] = source | ||||
elif dest in self._copymap: | ||||
del self._copymap[dest] | ||||
mpm@selenic.com
|
r1089 | |||
def copied(self, file): | ||||
Matt Mackall
|
r4614 | return self._copymap.get(file, None) | ||
Matt Mackall
|
r3154 | |||
def copies(self): | ||||
Matt Mackall
|
r4614 | return self._copymap | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r6767 | def _droppath(self, f): | ||
if self[f] not in "?r" and "_dirs" in self.__dict__: | ||||
Benoit Boissinot
|
r7096 | _decdirs(self._dirs, f) | ||
Vadim Gelfer
|
r2953 | |||
Matt Mackall
|
r6767 | def _addpath(self, f, check=False): | ||
Maxim Dounin
|
r5487 | oldstate = self[f] | ||
Matt Mackall
|
r6767 | if check or oldstate == "r": | ||
if '\r' in f or '\n' in f: | ||||
raise util.Abort( | ||||
_("'\\n' and '\\r' disallowed in filenames: %r") % f) | ||||
if f in self._dirs: | ||||
raise util.Abort(_('directory %r already in dirstate') % f) | ||||
# shadows | ||||
for d in _finddirs(f): | ||||
if d in self._dirs: | ||||
break | ||||
if d in self._map and self[d] != 'r': | ||||
raise util.Abort( | ||||
_('file %r in dirstate clashes with %r') % (d, f)) | ||||
if oldstate in "?r" and "_dirs" in self.__dict__: | ||||
Benoit Boissinot
|
r7096 | _incdirs(self._dirs, f) | ||
Maxim Dounin
|
r5487 | |||
Matt Mackall
|
r4904 | def normal(self, f): | ||
Alexis S. L. Carvalho
|
r5210 | 'mark a file normal and clean' | ||
Matt Mackall
|
r4904 | self._dirty = True | ||
Matt Mackall
|
r6767 | self._addpath(f) | ||
Matt Mackall
|
r4905 | s = os.lstat(self._join(f)) | ||
Matt Mackall
|
r7119 | self._map[f] = ('n', s.st_mode, s.st_size, int(s.st_mtime)) | ||
Christian Ebert
|
r5915 | if f in self._copymap: | ||
Matt Mackall
|
r4904 | del self._copymap[f] | ||
mpm@selenic.com
|
r1089 | |||
Alexis S. L. Carvalho
|
r5210 | def normallookup(self, f): | ||
Matt Mackall
|
r4904 | 'mark a file normal, but possibly dirty' | ||
Alexis S. L. Carvalho
|
r6298 | if self._pl[1] != nullid and f in self._map: | ||
# if there is a merge going on and the file was either | ||||
# in state 'm' or dirty before being removed, restore that state. | ||||
entry = self._map[f] | ||||
if entry[0] == 'r' and entry[2] in (-1, -2): | ||||
source = self._copymap.get(f) | ||||
if entry[2] == -1: | ||||
self.merge(f) | ||||
elif entry[2] == -2: | ||||
self.normaldirty(f) | ||||
if source: | ||||
self.copy(source, f) | ||||
return | ||||
if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2: | ||||
return | ||||
Matt Mackall
|
r4903 | self._dirty = True | ||
Matt Mackall
|
r6767 | self._addpath(f) | ||
Matt Mackall
|
r7093 | self._map[f] = ('n', 0, -1, -1) | ||
Alexis S. L. Carvalho
|
r5210 | if f in self._copymap: | ||
del self._copymap[f] | ||||
def normaldirty(self, f): | ||||
'mark a file normal, but dirty' | ||||
self._dirty = True | ||||
Matt Mackall
|
r6767 | self._addpath(f) | ||
Matt Mackall
|
r7093 | self._map[f] = ('n', 0, -2, -1) | ||
Matt Mackall
|
r4904 | if f in self._copymap: | ||
del self._copymap[f] | ||||
def add(self, f): | ||||
'mark a file added' | ||||
self._dirty = True | ||||
Matt Mackall
|
r6767 | self._addpath(f, True) | ||
Matt Mackall
|
r7093 | self._map[f] = ('a', 0, -1, -1) | ||
Matt Mackall
|
r4904 | if f in self._copymap: | ||
del self._copymap[f] | ||||
Matt Mackall
|
r4616 | |||
Matt Mackall
|
r4904 | def remove(self, f): | ||
'mark a file removed' | ||||
self._dirty = True | ||||
Matt Mackall
|
r6767 | self._droppath(f) | ||
Alexis S. L. Carvalho
|
r6297 | size = 0 | ||
if self._pl[1] != nullid and f in self._map: | ||||
entry = self._map[f] | ||||
if entry[0] == 'm': | ||||
size = -1 | ||||
elif entry[0] == 'n' and entry[2] == -2: | ||||
size = -2 | ||||
Matt Mackall
|
r7093 | self._map[f] = ('r', 0, size, 0) | ||
Alexis S. L. Carvalho
|
r6297 | if size == 0 and f in self._copymap: | ||
Matt Mackall
|
r4904 | del self._copymap[f] | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r4904 | def merge(self, f): | ||
'mark a file merged' | ||||
Matt Mackall
|
r4903 | self._dirty = True | ||
Matt Mackall
|
r4905 | s = os.lstat(self._join(f)) | ||
Matt Mackall
|
r6767 | self._addpath(f) | ||
Matt Mackall
|
r7119 | self._map[f] = ('m', s.st_mode, s.st_size, int(s.st_mtime)) | ||
Matt Mackall
|
r4904 | if f in self._copymap: | ||
del self._copymap[f] | ||||
def forget(self, f): | ||||
'forget a file' | ||||
self._dirty = True | ||||
try: | ||||
Patrick Mezard
|
r6807 | self._droppath(f) | ||
Matt Mackall
|
r4904 | del self._map[f] | ||
except KeyError: | ||||
Thomas Arendsen Hein
|
r6057 | self._ui.warn(_("not in dirstate: %s\n") % f) | ||
mpm@selenic.com
|
r1089 | |||
Petr Kodl
|
r7068 | def _normalize(self, path, knownpath=False): | ||
Petr Kodl
|
r7069 | norm_path = os.path.normcase(path) | ||
Petr Kodl
|
r7068 | fold_path = self._foldmap.get(norm_path, None) | ||
if fold_path is None: | ||||
if knownpath or not os.path.exists(os.path.join(self._root, path)): | ||||
fold_path = path | ||||
else: | ||||
fold_path = self._foldmap.setdefault(norm_path, | ||||
util.fspath(path, self._root)) | ||||
return fold_path | ||||
Paul Moore
|
r6677 | |||
Alexis S. L. Carvalho
|
r5065 | def clear(self): | ||
self._map = {} | ||||
Maxim Dounin
|
r5487 | if "_dirs" in self.__dict__: | ||
delattr(self, "_dirs"); | ||||
Alexis S. L. Carvalho
|
r5065 | self._copymap = {} | ||
self._pl = [nullid, nullid] | ||||
Alexis S. L. Carvalho
|
r5123 | self._dirty = True | ||
Alexis S. L. Carvalho
|
r5065 | |||
Benoit Boissinot
|
r1755 | def rebuild(self, parent, files): | ||
Alexis S. L. Carvalho
|
r5065 | self.clear() | ||
Matt Mackall
|
r2832 | for f in files: | ||
Matt Mackall
|
r6750 | if 'x' in files.flags(f): | ||
Matt Mackall
|
r7093 | self._map[f] = ('n', 0777, -1, 0) | ||
Benoit Boissinot
|
r1755 | else: | ||
Matt Mackall
|
r7093 | self._map[f] = ('n', 0666, -1, 0) | ||
Matt Mackall
|
r4614 | self._pl = (parent, nullid) | ||
Matt Mackall
|
r4903 | self._dirty = True | ||
mpm@selenic.com
|
r1089 | |||
def write(self): | ||||
Matt Mackall
|
r4612 | if not self._dirty: | ||
Benoit Boissinot
|
r1794 | return | ||
Alexis S. L. Carvalho
|
r6326 | st = self._opener("dirstate", "w", atomictemp=True) | ||
Matt Mackall
|
r6327 | |||
try: | ||||
gran = int(self._ui.config('dirstate', 'granularity', 1)) | ||||
except ValueError: | ||||
gran = 1 | ||||
limit = sys.maxint | ||||
if gran > 0: | ||||
limit = util.fstat(st).st_mtime - gran | ||||
Bryan O'Sullivan
|
r4374 | cs = cStringIO.StringIO() | ||
Matt Mackall
|
r5327 | copymap = self._copymap | ||
pack = struct.pack | ||||
write = cs.write | ||||
write("".join(self._pl)) | ||||
Matt Mackall
|
r4614 | for f, e in self._map.iteritems(): | ||
Matt Mackall
|
r5327 | if f in copymap: | ||
f = "%s\0%s" % (f, copymap[f]) | ||||
Alexis S. L. Carvalho
|
r6326 | if e[3] > limit and e[0] == 'n': | ||
Matt Mackall
|
r7093 | e = (e[0], 0, -1, -1) | ||
Matt Mackall
|
r5327 | e = pack(_format, e[0], e[1], e[2], e[3], len(f)) | ||
write(e) | ||||
write(f) | ||||
Bryan O'Sullivan
|
r4374 | st.write(cs.getvalue()) | ||
Alexis S. L. Carvalho
|
r4507 | st.rename() | ||
Matt Mackall
|
r4965 | self._dirty = self._dirtypl = False | ||
mpm@selenic.com
|
r1089 | |||
Alexis S. L. Carvalho
|
r6032 | def _dirignore(self, f): | ||
Patrick Mezard
|
r6479 | if f == '.': | ||
return False | ||||
Alexis S. L. Carvalho
|
r6032 | if self._ignore(f): | ||
return True | ||||
Matt Mackall
|
r6767 | for p in _finddirs(f): | ||
if self._ignore(p): | ||||
Alexis S. L. Carvalho
|
r6032 | return True | ||
return False | ||||
Matt Mackall
|
r6755 | def walk(self, match, unknown, ignored): | ||
Matt Mackall
|
r3529 | ''' | ||
walk recursively through the directory tree, finding all files | ||||
matched by the match function | ||||
Matt Mackall
|
r6818 | results are yielded in a tuple (filename, stat), where stat | ||
Matt Mackall
|
r3529 | and st is the stat result if the file was found in the directory. | ||
''' | ||||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r6578 | def fwarn(f, msg): | ||
Benoit Boissinot
|
r7023 | self._ui.warn('%s: %s\n' % (self.pathto(f), msg)) | ||
Matt Mackall
|
r6578 | return False | ||
Matt Mackall
|
r8681 | def badtype(mode): | ||
Simon Heimberg
|
r8310 | kind = _('unknown') | ||
Matt Mackall
|
r6830 | if stat.S_ISCHR(mode): kind = _('character device') | ||
elif stat.S_ISBLK(mode): kind = _('block device') | ||||
elif stat.S_ISFIFO(mode): kind = _('fifo') | ||||
elif stat.S_ISSOCK(mode): kind = _('socket') | ||||
elif stat.S_ISDIR(mode): kind = _('directory') | ||||
Matt Mackall
|
r8681 | return _('unsupported file type (type is %s)') % kind | ||
Matt Mackall
|
r6830 | |||
Matt Mackall
|
r4609 | ignore = self._ignore | ||
Alexis S. L. Carvalho
|
r6032 | dirignore = self._dirignore | ||
Alexis S. L. Carvalho
|
r4193 | if ignored: | ||
ignore = util.never | ||||
Alexis S. L. Carvalho
|
r6032 | dirignore = util.never | ||
Benoit Boissinot
|
r6971 | elif not unknown: | ||
# if unknown and ignored are False, skip step 2 | ||||
ignore = util.always | ||||
dirignore = util.always | ||||
Matt Mackall
|
r3534 | |||
Matt Mackall
|
r6834 | matchfn = match.matchfn | ||
Matt Mackall
|
r8676 | badfn = match.bad | ||
Matt Mackall
|
r6831 | dmap = self._map | ||
Matt Mackall
|
r5000 | normpath = util.normpath | ||
Matt Mackall
|
r6822 | normalize = self.normalize | ||
Bryan O'Sullivan
|
r5396 | listdir = osutil.listdir | ||
Matt Mackall
|
r5000 | lstat = os.lstat | ||
Matt Mackall
|
r6830 | getkind = stat.S_IFMT | ||
Matt Mackall
|
r6828 | dirkind = stat.S_IFDIR | ||
Matt Mackall
|
r6830 | regkind = stat.S_IFREG | ||
lnkkind = stat.S_IFLNK | ||||
Matt Mackall
|
r6831 | join = self._join | ||
Matt Mackall
|
r6820 | work = [] | ||
wadd = work.append | ||||
Matt Mackall
|
r8683 | if match.anypats(): # match.match or .exact with patterns | ||
Simon Heimberg
|
r8589 | dostep3 = True | ||
Matt Mackall
|
r8683 | exact = False | ||
elif matchfn == match.exact: # match.exact without patterns | ||||
dostep3 = False | ||||
exact = True | ||||
elif match.files(): # match.match without patterns | ||||
Simon Heimberg
|
r8589 | dostep3 = False | ||
Matt Mackall
|
r8683 | exact = False | ||
else: # match.always | ||||
dostep3 = True | ||||
exact = False | ||||
Simon Heimberg
|
r8589 | |||
Matt Mackall
|
r8683 | if exact: # skip step 2 | ||
Simon Heimberg
|
r8589 | dirignore = util.always | ||
Martin Geisler
|
r8151 | files = set(match.files()) | ||
Matt Mackall
|
r6831 | if not files or '.' in files: | ||
files = [''] | ||||
results = {'.hg': None} | ||||
Matt Mackall
|
r5000 | |||
Matt Mackall
|
r6826 | # step 1: find all explicit files | ||
Matt Mackall
|
r8209 | for ff in sorted(files): | ||
Matt Mackall
|
r6822 | nf = normalize(normpath(ff)) | ||
Matt Mackall
|
r6829 | if nf in results: | ||
Matt Mackall
|
r6820 | continue | ||
try: | ||||
Matt Mackall
|
r6831 | st = lstat(join(nf)) | ||
Matt Mackall
|
r6830 | kind = getkind(st.st_mode) | ||
if kind == dirkind: | ||||
Simon Heimberg
|
r8589 | dostep3 = True | ||
Simon Heimberg
|
r8588 | if nf in dmap: | ||
Martin Geisler
|
r8645 | #file deleted on disk but still in dirstate | ||
Simon Heimberg
|
r8588 | results[nf] = None | ||
Matt Mackall
|
r6828 | if not dirignore(nf): | ||
wadd(nf) | ||||
Matt Mackall
|
r6830 | elif kind == regkind or kind == lnkkind: | ||
results[nf] = st | ||||
Matt Mackall
|
r6828 | else: | ||
Matt Mackall
|
r8681 | badfn(ff, badtype(kind)) | ||
Matt Mackall
|
r6830 | if nf in dmap: | ||
Matt Mackall
|
r6829 | results[nf] = None | ||
Matt Mackall
|
r6820 | except OSError, inst: | ||
Matt Mackall
|
r8675 | if nf in dmap: # does it exactly match a file? | ||
results[nf] = None | ||||
else: # does it match a directory? | ||||
prefix = nf + "/" | ||||
for fn in dmap: | ||||
if fn.startswith(prefix): | ||||
dostep3 = True | ||||
break | ||||
Matt Mackall
|
r8677 | else: | ||
Matt Mackall
|
r8680 | badfn(ff, inst.strerror) | ||
Matt Mackall
|
r6820 | |||
Matt Mackall
|
r6826 | # step 2: visit subdirectories | ||
while work: | ||||
nd = work.pop() | ||||
if hasattr(match, 'dir'): | ||||
match.dir(nd) | ||||
Benoit Boissinot
|
r7099 | skip = None | ||
Matt Mackall
|
r6826 | if nd == '.': | ||
nd = '' | ||||
else: | ||||
Benoit Boissinot
|
r7099 | skip = '.hg' | ||
try: | ||||
entries = listdir(join(nd), stat=True, skip=skip) | ||||
except OSError, inst: | ||||
if inst.errno == errno.EACCES: | ||||
fwarn(nd, inst.strerror) | ||||
continue | ||||
raise | ||||
Matt Mackall
|
r6826 | for f, kind, st in entries: | ||
Petr Kodl
|
r7068 | nf = normalize(nd and (nd + "/" + f) or f, True) | ||
Matt Mackall
|
r6829 | if nf not in results: | ||
Matt Mackall
|
r6828 | if kind == dirkind: | ||
if not ignore(nf): | ||||
wadd(nf) | ||||
Matt Mackall
|
r6834 | if nf in dmap and matchfn(nf): | ||
Matt Mackall
|
r6829 | results[nf] = None | ||
Matt Mackall
|
r6832 | elif kind == regkind or kind == lnkkind: | ||
if nf in dmap: | ||||
Matt Mackall
|
r6834 | if matchfn(nf): | ||
Matt Mackall
|
r6832 | results[nf] = st | ||
Matt Mackall
|
r6834 | elif matchfn(nf) and not ignore(nf): | ||
Matt Mackall
|
r6829 | results[nf] = st | ||
Matt Mackall
|
r6834 | elif nf in dmap and matchfn(nf): | ||
Matt Mackall
|
r6832 | results[nf] = None | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r6826 | # step 3: report unseen items in the dmap hash | ||
Matt Mackall
|
r8683 | if dostep3 and not exact: | ||
Simon Heimberg
|
r8589 | visit = sorted([f for f in dmap if f not in results and matchfn(f)]) | ||
for nf, st in zip(visit, util.statfiles([join(i) for i in visit])): | ||||
if not st is None and not getkind(st.st_mode) in (regkind, lnkkind): | ||||
st = None | ||||
results[nf] = st | ||||
Matt Mackall
|
r6829 | |||
Matt Mackall
|
r6831 | del results['.hg'] | ||
Matt Mackall
|
r6829 | return results | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r6753 | def status(self, match, ignored, clean, unknown): | ||
listignored, listclean, listunknown = ignored, clean, unknown | ||||
Thomas Arendsen Hein
|
r2022 | lookup, modified, added, unknown, ignored = [], [], [], [], [] | ||
Vadim Gelfer
|
r2661 | removed, deleted, clean = [], [], [] | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r5003 | dmap = self._map | ||
ladd = lookup.append | ||||
madd = modified.append | ||||
aadd = added.append | ||||
uadd = unknown.append | ||||
iadd = ignored.append | ||||
radd = removed.append | ||||
dadd = deleted.append | ||||
cadd = clean.append | ||||
Matt Mackall
|
r6829 | for fn, st in self.walk(match, listunknown, listignored).iteritems(): | ||
Matt Mackall
|
r6591 | if fn not in dmap: | ||
Matt Mackall
|
r6753 | if (listignored or match.exact(fn)) and self._dirignore(fn): | ||
if listignored: | ||||
Alexis S. L. Carvalho
|
r6033 | iadd(fn) | ||
Matt Mackall
|
r6753 | elif listunknown: | ||
Matt Mackall
|
r5003 | uadd(fn) | ||
Benoit Boissinot
|
r1471 | continue | ||
Matt Mackall
|
r6591 | |||
Matt Mackall
|
r7093 | state, mode, size, time = dmap[fn] | ||
Matt Mackall
|
r6591 | |||
Matt Mackall
|
r6818 | if not st and state in "nma": | ||
dadd(fn) | ||||
elif state == 'n': | ||||
Alexis S. L. Carvalho
|
r6257 | if (size >= 0 and | ||
(size != st.st_size | ||||
or ((mode ^ st.st_mode) & 0100 and self._checkexec)) | ||||
Alexis S. L. Carvalho
|
r5210 | or size == -2 | ||
Alexis S. L. Carvalho
|
r4677 | or fn in self._copymap): | ||
Matt Mackall
|
r5003 | madd(fn) | ||
Alexis S. L. Carvalho
|
r2962 | elif time != int(st.st_mtime): | ||
Matt Mackall
|
r5003 | ladd(fn) | ||
Matt Mackall
|
r6753 | elif listclean: | ||
Matt Mackall
|
r5003 | cadd(fn) | ||
Matt Mackall
|
r6590 | elif state == 'm': | ||
Matt Mackall
|
r5003 | madd(fn) | ||
Matt Mackall
|
r6590 | elif state == 'a': | ||
Matt Mackall
|
r5003 | aadd(fn) | ||
Matt Mackall
|
r6590 | elif state == 'r': | ||
Matt Mackall
|
r5003 | radd(fn) | ||
mason@suse.com
|
r1183 | |||
Vadim Gelfer
|
r2661 | return (lookup, modified, added, removed, deleted, unknown, ignored, | ||
clean) | ||||