dirstate.py
810 lines
| 26.5 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 | ||||
Matt Mackall
|
r10263 | # GNU General Public License version 2 or any later version. | ||
Pierre-Yves David
|
r15799 | import errno | ||
mpm@selenic.com
|
r1089 | |||
Joel Rosdahl
|
r6211 | from node import nullid | ||
Matt Mackall
|
r3891 | from i18n import _ | ||
Adrian Buehlmann
|
r13974 | import scmutil, util, ignore, osutil, parsers, encoding | ||
Simon Heimberg
|
r8312 | import struct, os, stat, errno | ||
Benoit Boissinot
|
r9678 | import cStringIO | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r4610 | _format = ">cllll" | ||
Matt Mackall
|
r8261 | propertycache = util.propertycache | ||
Idan Kamara
|
r16201 | filecache = scmutil.filecache | ||
Matt Mackall
|
r17733 | _rangemask = 0x7fffffff | ||
Idan Kamara
|
r16201 | |||
class repocache(filecache): | ||||
"""filecache for files in .hg/""" | ||||
def join(self, obj, fname): | ||||
return obj._opener.join(fname) | ||||
Matt Mackall
|
r4610 | |||
Idan Kamara
|
r16202 | class rootcache(filecache): | ||
"""filecache for files in the repository root""" | ||||
def join(self, obj, fname): | ||||
return obj._join(fname) | ||||
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 | |||
Matt Mackall
|
r13032 | def __init__(self, opener, ui, root, validate): | ||
Martin Geisler
|
r10145 | '''Create a new dirstate object. | ||
opener is an open()-like callable that can be used to open the | ||||
dirstate file; root is the root of the directory tracked by | ||||
the dirstate. | ||||
''' | ||||
Matt Mackall
|
r4614 | self._opener = opener | ||
Matt Mackall
|
r13032 | self._validate = validate | ||
Matt Mackall
|
r4614 | self._root = root | ||
Benoit Boissinot
|
r6972 | self._rootdir = os.path.join(root, '') | ||
Matt Mackall
|
r4903 | self._dirty = False | ||
Matt Mackall
|
r4965 | self._dirtypl = False | ||
Martin Geisler
|
r15791 | self._lastnormaltime = 0 | ||
Matt Mackall
|
r4614 | self._ui = ui | ||
Idan Kamara
|
r16200 | self._filecache = {} | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r8261 | @propertycache | ||
def _map(self): | ||||
Greg Ward
|
r9518 | '''Return the dirstate contents as a map from filename to | ||
(state, mode, size, time).''' | ||||
Matt Mackall
|
r8261 | self._read() | ||
return self._map | ||||
@propertycache | ||||
def _copymap(self): | ||||
self._read() | ||||
return self._copymap | ||||
@propertycache | ||||
def _foldmap(self): | ||||
f = {} | ||||
for name in self._map: | ||||
Matt Mackall
|
r15550 | f[util.normcase(name)] = name | ||
Matt Mackall
|
r16302 | for name in self._dirs: | ||
f[util.normcase(name)] = name | ||||
FUJIWARA Katsunori
|
r15668 | f['.'] = '.' # prevents useless util.fspath() invocation | ||
Matt Mackall
|
r8261 | return f | ||
Idan Kamara
|
r16201 | @repocache('branch') | ||
Matt Mackall
|
r8261 | def _branch(self): | ||
try: | ||||
Dan Villiom Podlaski Christiansen
|
r14168 | return self._opener.read("branch").strip() or "default" | ||
Pierre-Yves David
|
r15799 | except IOError, inst: | ||
if inst.errno != errno.ENOENT: | ||||
raise | ||||
Matt Mackall
|
r8261 | return "default" | ||
@propertycache | ||||
def _pl(self): | ||||
try: | ||||
Dan Villiom Podlaski Christiansen
|
r13400 | fp = self._opener("dirstate") | ||
st = fp.read(40) | ||||
fp.close() | ||||
Matt Mackall
|
r8716 | l = len(st) | ||
if l == 40: | ||||
Matt Mackall
|
r8261 | return st[:20], st[20:40] | ||
Matt Mackall
|
r8716 | elif l > 0 and l < 40: | ||
Matt Mackall
|
r8640 | raise util.Abort(_('working directory state appears damaged!')) | ||
Matt Mackall
|
r8261 | except IOError, err: | ||
Matt Mackall
|
r10282 | if err.errno != errno.ENOENT: | ||
raise | ||||
Matt Mackall
|
r8261 | return [nullid, nullid] | ||
@propertycache | ||||
def _dirs(self): | ||||
dirs = {} | ||||
Matt Mackall
|
r10282 | for f, s in self._map.iteritems(): | ||
Matt Mackall
|
r8261 | if s[0] != 'r': | ||
_incdirs(dirs, f) | ||||
return dirs | ||||
FUJIWARA Katsunori
|
r16143 | def dirs(self): | ||
return self._dirs | ||||
Idan Kamara
|
r16202 | @rootcache('.hgignore') | ||
Matt Mackall
|
r8261 | def _ignore(self): | ||
files = [self._join('.hgignore')] | ||||
for name, path in self._ui.configitems("ui"): | ||||
if name == 'ignore' or name.startswith('ignore.'): | ||||
Alexander Solovyov
|
r9610 | files.append(util.expandpath(path)) | ||
Matt Mackall
|
r8261 | 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')) | ||||
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
|
r15337 | def flagfunc(self, buildfallback): | ||
if self._checklink and self._checkexec: | ||||
def f(x): | ||||
p = self._join(x) | ||||
if os.path.islink(p): | ||||
return 'l' | ||||
if util.isexec(p): | ||||
return 'x' | ||||
return '' | ||||
return f | ||||
fallback = buildfallback() | ||||
Matt Mackall
|
r6743 | if self._checklink: | ||
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' | ||||
Adrian Buehlmann
|
r14273 | if util.isexec(self._join(x)): | ||
Matt Mackall
|
r6743 | return 'x' | ||
return '' | ||||
return f | ||||
Matt Mackall
|
r15337 | else: | ||
return fallback | ||||
Matt Mackall
|
r6743 | |||
mpm@selenic.com
|
r1089 | def getcwd(self): | ||
cwd = os.getcwd() | ||||
Matt Mackall
|
r10282 | if cwd == self._root: | ||
return '' | ||||
Matt Mackall
|
r4614 | # 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): | ||
Greg Ward
|
r9518 | '''Return the current state of key (a filename) in the dirstate. | ||
Martin Geisler
|
r10145 | |||
Greg Ward
|
r9518 | States are: | ||
n normal | ||||
m needs merging | ||||
r marked for removal | ||||
a marked for addition | ||||
? not tracked | ||||
''' | ||||
Matt Mackall
|
r4906 | 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
|
r13032 | return [self._validate(p) for p in self._pl] | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r13876 | def p1(self): | ||
return self._validate(self._pl[0]) | ||||
def p2(self): | ||||
return self._validate(self._pl[1]) | ||||
Matt Mackall
|
r4179 | def branch(self): | ||
Matt Mackall
|
r13047 | return encoding.tolocal(self._branch) | ||
Matt Mackall
|
r4179 | |||
mpm@selenic.com
|
r1089 | def setparents(self, p1, p2=nullid): | ||
Patrick Mezard
|
r16551 | """Set dirstate parents to p1 and p2. | ||
When moving from two parents to one, 'm' merged entries a | ||||
adjusted to normal and previous copy records discarded and | ||||
returned by the call. | ||||
See localrepo.setparents() | ||||
""" | ||||
Matt Mackall
|
r4965 | self._dirty = self._dirtypl = True | ||
Patrick Mezard
|
r16509 | oldp2 = self._pl[1] | ||
Matt Mackall
|
r4614 | self._pl = p1, p2 | ||
Patrick Mezard
|
r16551 | copies = {} | ||
Patrick Mezard
|
r16509 | if oldp2 != nullid and p2 == nullid: | ||
# Discard 'm' markers when moving away from a merge state | ||||
for f, s in self._map.iteritems(): | ||||
if s[0] == 'm': | ||||
Patrick Mezard
|
r16551 | if f in self._copymap: | ||
copies[f] = self._copymap[f] | ||||
Patrick Mezard
|
r16509 | self.normallookup(f) | ||
Patrick Mezard
|
r16551 | return copies | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r4179 | def setbranch(self, branch): | ||
Matt Mackall
|
r13047 | self._branch = encoding.fromlocal(branch) | ||
Idan Kamara
|
r16472 | f = self._opener('branch', 'w', atomictemp=True) | ||
try: | ||||
f.write(self._branch + '\n') | ||||
f.close() | ||||
Idan Kamara
|
r18076 | except: # re-raises | ||
f.discard() | ||||
raise | ||||
Matt Mackall
|
r4179 | |||
Matt Mackall
|
r4615 | def _read(self): | ||
Matt Mackall
|
r4614 | self._map = {} | ||
self._copymap = {} | ||||
Matt Mackall
|
r4607 | try: | ||
Dan Villiom Podlaski Christiansen
|
r14168 | st = self._opener.read("dirstate") | ||
Matt Mackall
|
r4607 | except IOError, err: | ||
Matt Mackall
|
r10282 | if err.errno != errno.ENOENT: | ||
raise | ||||
Matt Mackall
|
r4607 | 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): | ||
David Soria Parra
|
r13200 | for a in ("_map", "_copymap", "_foldmap", "_branch", "_pl", "_dirs", | ||
"_ignore"): | ||||
Alexis S. L. Carvalho
|
r4953 | if a in self.__dict__: | ||
delattr(self, a) | ||||
Martin Geisler
|
r15791 | self._lastnormaltime = 0 | ||
Matt Mackall
|
r4903 | self._dirty = False | ||
Bryan O'Sullivan
|
r4375 | |||
mpm@selenic.com
|
r1089 | def copy(self, source, dest): | ||
Martin Geisler
|
r10145 | """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 | |||
Adrian Buehlmann
|
r17196 | def _addpath(self, f, state, mode, size, mtime): | ||
Maxim Dounin
|
r5487 | oldstate = self[f] | ||
Adrian Buehlmann
|
r17196 | if state == 'a' or oldstate == 'r': | ||
Adrian Buehlmann
|
r13974 | scmutil.checkfilename(f) | ||
Matt Mackall
|
r6767 | 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) | ||
Joshua Redstone
|
r17094 | self._dirty = True | ||
self._map[f] = (state, mode, size, mtime) | ||||
Maxim Dounin
|
r5487 | |||
Matt Mackall
|
r4904 | def normal(self, f): | ||
Martin Geisler
|
r10145 | '''Mark a file normal and clean.''' | ||
Matt Mackall
|
r4905 | s = os.lstat(self._join(f)) | ||
Adrian Buehlmann
|
r13754 | mtime = int(s.st_mtime) | ||
Matt Mackall
|
r17733 | self._addpath(f, 'n', s.st_mode, | ||
s.st_size & _rangemask, mtime & _rangemask) | ||||
Christian Ebert
|
r5915 | if f in self._copymap: | ||
Matt Mackall
|
r4904 | del self._copymap[f] | ||
Adrian Buehlmann
|
r13763 | if mtime > self._lastnormaltime: | ||
# Remember the most recent modification timeslot for status(), | ||||
Adrian Buehlmann
|
r13754 | # to make sure we won't miss future size-preserving file content | ||
# modifications that happen within the same timeslot. | ||||
Adrian Buehlmann
|
r13763 | self._lastnormaltime = mtime | ||
Greg Ward
|
r13704 | |||
Alexis S. L. Carvalho
|
r5210 | def normallookup(self, f): | ||
Martin Geisler
|
r10145 | '''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 | ||||
Benoit Boissinot
|
r10968 | # in state 'm' (-1) or coming from other parent (-2) before | ||
# being removed, restore that state. | ||||
Alexis S. L. Carvalho
|
r6298 | 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: | ||||
Benoit Boissinot
|
r10968 | self.otherparent(f) | ||
Alexis S. L. Carvalho
|
r6298 | if source: | ||
self.copy(source, f) | ||||
return | ||||
if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2: | ||||
return | ||||
Joshua Redstone
|
r17094 | self._addpath(f, 'n', 0, -1, -1) | ||
Alexis S. L. Carvalho
|
r5210 | if f in self._copymap: | ||
del self._copymap[f] | ||||
Benoit Boissinot
|
r10968 | def otherparent(self, f): | ||
'''Mark as coming from the other parent, always dirty.''' | ||||
if self._pl[1] == nullid: | ||||
raise util.Abort(_("setting %r to other parent " | ||||
"only allowed in merges") % f) | ||||
Joshua Redstone
|
r17094 | self._addpath(f, 'n', 0, -2, -1) | ||
Matt Mackall
|
r4904 | if f in self._copymap: | ||
del self._copymap[f] | ||||
def add(self, f): | ||||
Martin Geisler
|
r10145 | '''Mark a file added.''' | ||
Adrian Buehlmann
|
r17196 | self._addpath(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): | ||
Martin Geisler
|
r10145 | '''Mark a file removed.''' | ||
Matt Mackall
|
r4904 | 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: | ||||
Benoit Boissinot
|
r10968 | # backup the previous state | ||
Alexis S. L. Carvalho
|
r6297 | entry = self._map[f] | ||
Benoit Boissinot
|
r10968 | if entry[0] == 'm': # merge | ||
Alexis S. L. Carvalho
|
r6297 | size = -1 | ||
Benoit Boissinot
|
r10968 | elif entry[0] == 'n' and entry[2] == -2: # other parent | ||
Alexis S. L. Carvalho
|
r6297 | 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): | ||
Martin Geisler
|
r10145 | '''Mark a file merged.''' | ||
Patrick Mezard
|
r16509 | if self._pl[1] == nullid: | ||
return self.normallookup(f) | ||||
Matt Mackall
|
r4905 | s = os.lstat(self._join(f)) | ||
Matt Mackall
|
r17733 | self._addpath(f, 'm', s.st_mode, | ||
s.st_size & _rangemask, int(s.st_mtime) & _rangemask) | ||||
Matt Mackall
|
r4904 | if f in self._copymap: | ||
del self._copymap[f] | ||||
Matt Mackall
|
r14434 | def drop(self, f): | ||
'''Drop a file from the dirstate''' | ||||
Matt Mackall
|
r15399 | if f in self._map: | ||
self._dirty = True | ||||
self._droppath(f) | ||||
del self._map[f] | ||||
mpm@selenic.com
|
r1089 | |||
Patrick Mezard
|
r16542 | def _normalize(self, path, isknown, ignoremissing=False, exists=None): | ||
Matt Mackall
|
r15488 | normed = util.normcase(path) | ||
Matt Mackall
|
r13717 | folded = self._foldmap.get(normed, None) | ||
if folded is None: | ||||
Patrick Mezard
|
r16542 | if isknown: | ||
Matt Mackall
|
r13717 | folded = path | ||
Petr Kodl
|
r7068 | else: | ||
Patrick Mezard
|
r16542 | if exists is None: | ||
exists = os.path.lexists(os.path.join(self._root, path)) | ||||
if not exists: | ||||
# Maybe a path component exists | ||||
if not ignoremissing and '/' in path: | ||||
d, f = path.rsplit('/', 1) | ||||
d = self._normalize(d, isknown, ignoremissing, None) | ||||
folded = d + "/" + f | ||||
else: | ||||
# No path components, preserve original case | ||||
folded = path | ||||
Matt Mackall
|
r16302 | else: | ||
Patrick Mezard
|
r16542 | # recursively normalize leading directory components | ||
# against dirstate | ||||
if '/' in normed: | ||||
d, f = normed.rsplit('/', 1) | ||||
d = self._normalize(d, isknown, ignoremissing, True) | ||||
r = self._root + "/" + d | ||||
folded = d + "/" + util.fspath(f, r) | ||||
else: | ||||
folded = util.fspath(normed, self._root) | ||||
self._foldmap[normed] = folded | ||||
Matt Mackall
|
r16302 | |||
Matt Mackall
|
r13717 | return folded | ||
Patrick Mezard
|
r16542 | def normalize(self, path, isknown=False, ignoremissing=False): | ||
Matt Mackall
|
r13717 | ''' | ||
normalize the case of a pathname when on a casefolding filesystem | ||||
isknown specifies whether the filename came from walking the | ||||
Patrick Mezard
|
r16542 | disk, to avoid extra filesystem access. | ||
If ignoremissing is True, missing path are returned | ||||
unchanged. Otherwise, we try harder to normalize possibly | ||||
existing path components. | ||||
Matt Mackall
|
r13717 | |||
The normalized case is determined based on the following precedence: | ||||
- version of name already stored in the dirstate | ||||
- version of name stored on disk | ||||
- version provided via command arguments | ||||
''' | ||||
if self._checkcase: | ||||
Patrick Mezard
|
r16542 | return self._normalize(path, isknown, ignoremissing) | ||
Matt Mackall
|
r13717 | return path | ||
Paul Moore
|
r6677 | |||
Alexis S. L. Carvalho
|
r5065 | def clear(self): | ||
self._map = {} | ||||
Maxim Dounin
|
r5487 | if "_dirs" in self.__dict__: | ||
Benoit Boissinot
|
r10394 | delattr(self, "_dirs") | ||
Alexis S. L. Carvalho
|
r5065 | self._copymap = {} | ||
self._pl = [nullid, nullid] | ||||
Martin Geisler
|
r15791 | self._lastnormaltime = 0 | ||
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 | |||
Bryan O'Sullivan
|
r16955 | def finish(s): | ||
st.write(s) | ||||
st.close() | ||||
self._lastnormaltime = 0 | ||||
self._dirty = self._dirtypl = False | ||||
Adrian Buehlmann
|
r9509 | # use the modification time of the newly created temporary file as the | ||
# filesystem's notion of 'now' | ||||
Bryan O'Sullivan
|
r16955 | now = util.fstat(st).st_mtime | ||
copymap = self._copymap | ||||
try: | ||||
finish(parsers.pack_dirstate(self._map, copymap, self._pl, now)) | ||||
return | ||||
except AttributeError: | ||||
pass | ||||
Benoit Boissinot
|
r10865 | |||
Bryan O'Sullivan
|
r16955 | now = int(now) | ||
Benoit Boissinot
|
r10865 | cs = cStringIO.StringIO() | ||
pack = struct.pack | ||||
write = cs.write | ||||
write("".join(self._pl)) | ||||
for f, e in self._map.iteritems(): | ||||
Adrian Buehlmann
|
r9509 | if e[0] == 'n' and e[3] == now: | ||
# The file was last modified "simultaneously" with the current | ||||
# write to dirstate (i.e. within the same second for file- | ||||
# systems with a granularity of 1 sec). This commonly happens | ||||
# for at least a couple of files on 'update'. | ||||
# The user could change the file without changing its size | ||||
# within the same second. Invalidate the file's stat data in | ||||
# dirstate, forcing future 'status' calls to compare the | ||||
# contents of the file. This prevents mistakenly treating such | ||||
# files as clean. | ||||
Benoit Boissinot
|
r10865 | e = (e[0], 0, -1, -1) # mark entry as 'unset' | ||
self._map[f] = e | ||||
Adrian Buehlmann
|
r9509 | |||
Benoit Boissinot
|
r10836 | if f in copymap: | ||
f = "%s\0%s" % (f, copymap[f]) | ||||
Matt Mackall
|
r5327 | e = pack(_format, e[0], e[1], e[2], e[3], len(f)) | ||
write(e) | ||||
write(f) | ||||
Bryan O'Sullivan
|
r16955 | finish(cs.getvalue()) | ||
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 | ||||
Augie Fackler
|
r10176 | def walk(self, match, subrepos, unknown, ignored): | ||
Matt Mackall
|
r3529 | ''' | ||
Greg Ward
|
r9518 | Walk recursively through the directory tree, finding all files | ||
matched by match. | ||||
Matt Mackall
|
r3529 | |||
Greg Ward
|
r9518 | Return a dict mapping filename to stat-like object (either | ||
mercurial.osutil.stat instance or return value of os.stat()). | ||||
Matt Mackall
|
r3529 | ''' | ||
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
|
r10282 | 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 | ||
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
|
r8684 | exact = skipstep3 = False | ||
if matchfn == match.exact: # match.exact | ||||
Matt Mackall
|
r8683 | exact = True | ||
Matt Mackall
|
r8684 | dirignore = util.always # skip step 2 | ||
elif match.files() and not match.anypats(): # match.match, no patterns | ||||
skipstep3 = True | ||||
Simon Heimberg
|
r8589 | |||
FUJIWARA Katsunori
|
r16313 | if not exact and self._checkcase: | ||
Matt Mackall
|
r12907 | normalize = self._normalize | ||
skipstep3 = False | ||||
else: | ||||
Siddharth Agarwal
|
r18032 | normalize = None | ||
Matt Mackall
|
r12907 | |||
Martin Geisler
|
r12211 | files = sorted(match.files()) | ||
subrepos.sort() | ||||
i, j = 0, 0 | ||||
while i < len(files) and j < len(subrepos): | ||||
subpath = subrepos[j] + "/" | ||||
Oleg Stepanov
|
r13233 | if files[i] < subpath: | ||
Martin Geisler
|
r12211 | i += 1 | ||
continue | ||||
trbs
|
r13339 | while i < len(files) and files[i].startswith(subpath): | ||
Martin Geisler
|
r12211 | del files[i] | ||
j += 1 | ||||
Matt Mackall
|
r6831 | if not files or '.' in files: | ||
files = [''] | ||||
Augie Fackler
|
r10176 | results = dict.fromkeys(subrepos) | ||
results['.hg'] = None | ||||
Matt Mackall
|
r5000 | |||
Matt Mackall
|
r6826 | # step 1: find all explicit files | ||
Martin Geisler
|
r12211 | for ff in files: | ||
Siddharth Agarwal
|
r18032 | if normalize: | ||
nf = normalize(normpath(ff), False, True) | ||||
else: | ||||
nf = 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: | ||||
Matt Mackall
|
r8684 | skipstep3 = False | ||
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
|
r8708 | match.dir(nf) | ||
Matt Mackall
|
r6828 | if not dirignore(nf): | ||
wadd(nf) | ||||
Matt Mackall
|
r12401 | elif kind == regkind or kind == lnkkind: | ||
Matt Mackall
|
r6830 | 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): | ||||
Matt Mackall
|
r8708 | match.dir(nf) | ||
Matt Mackall
|
r8684 | skipstep3 = False | ||
Matt Mackall
|
r8675 | 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() | ||||
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: | ||||
Bryan O'Sullivan
|
r17879 | if inst.errno in (errno.EACCES, errno.ENOENT): | ||
Benoit Boissinot
|
r7099 | fwarn(nd, inst.strerror) | ||
continue | ||||
raise | ||||
Matt Mackall
|
r6826 | for f, kind, st in entries: | ||
Siddharth Agarwal
|
r18032 | if normalize: | ||
nf = normalize(nd and (nd + "/" + f) or f, True, True) | ||||
else: | ||||
nf = nd and (nd + "/" + f) or f | ||||
Matt Mackall
|
r6829 | if nf not in results: | ||
Matt Mackall
|
r6828 | if kind == dirkind: | ||
if not ignore(nf): | ||||
Matt Mackall
|
r8708 | match.dir(nf) | ||
Matt Mackall
|
r6828 | 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
|
r8684 | if not skipstep3 and not exact: | ||
Simon Heimberg
|
r8589 | visit = sorted([f for f in dmap if f not in results and matchfn(f)]) | ||
Bryan O'Sullivan
|
r18018 | nf = iter(visit).next | ||
for st in util.statfiles([join(i) for i in visit]): | ||||
results[nf()] = st | ||||
Augie Fackler
|
r10176 | for s in subrepos: | ||
del results[s] | ||||
Matt Mackall
|
r6831 | del results['.hg'] | ||
Matt Mackall
|
r6829 | return results | ||
mpm@selenic.com
|
r1089 | |||
Augie Fackler
|
r10176 | def status(self, match, subrepos, ignored, clean, unknown): | ||
Greg Ward
|
r9518 | '''Determine the status of the working copy relative to the | ||
dirstate and return a tuple of lists (unsure, modified, added, | ||||
removed, deleted, unknown, ignored, clean), where: | ||||
unsure: | ||||
files that might have been modified since the dirstate was | ||||
written, but need to be read to be sure (size is the same | ||||
but mtime differs) | ||||
modified: | ||||
files that have definitely been modified since the dirstate | ||||
was written (different size or mode) | ||||
added: | ||||
files that have been explicitly added with hg add | ||||
removed: | ||||
files that have been explicitly removed with hg remove | ||||
deleted: | ||||
files that have been deleted through other means ("missing") | ||||
unknown: | ||||
files not in the dirstate that are not ignored | ||||
ignored: | ||||
files not in the dirstate that are ignored | ||||
(by _dirignore()) | ||||
clean: | ||||
files that have definitely not been modified since the | ||||
dirstate was written | ||||
''' | ||||
Matt Mackall
|
r6753 | 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 | ||
Greg Ward
|
r9518 | ladd = lookup.append # aka "unsure" | ||
Matt Mackall
|
r5003 | madd = modified.append | ||
aadd = added.append | ||||
uadd = unknown.append | ||||
iadd = ignored.append | ||||
radd = removed.append | ||||
dadd = deleted.append | ||||
cadd = clean.append | ||||
Siddharth Agarwal
|
r18034 | mexact = match.exact | ||
dirignore = self._dirignore | ||||
checkexec = self._checkexec | ||||
checklink = self._checklink | ||||
copymap = self._copymap | ||||
lastnormaltime = self._lastnormaltime | ||||
Matt Mackall
|
r5003 | |||
Martin Geisler
|
r11769 | lnkkind = stat.S_IFLNK | ||
Augie Fackler
|
r10176 | for fn, st in self.walk(match, subrepos, listunknown, | ||
listignored).iteritems(): | ||||
Matt Mackall
|
r6591 | if fn not in dmap: | ||
Siddharth Agarwal
|
r18034 | if (listignored or mexact(fn)) and dirignore(fn): | ||
Matt Mackall
|
r6753 | 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': | ||||
Martin Geisler
|
r11769 | # The "mode & lnkkind != lnkkind or self._checklink" | ||
# lines are an expansion of "islink => checklink" | ||||
# where islink means "is this a link?" and checklink | ||||
# means "can we check links?". | ||||
Adrian Buehlmann
|
r13763 | mtime = int(st.st_mtime) | ||
Alexis S. L. Carvalho
|
r6257 | if (size >= 0 and | ||
Matt Mackall
|
r17733 | ((size != st.st_size and size != st.st_size & _rangemask) | ||
Siddharth Agarwal
|
r18034 | or ((mode ^ st.st_mode) & 0100 and checkexec)) | ||
and (mode & lnkkind != lnkkind or checklink) | ||||
Benoit Boissinot
|
r10968 | or size == -2 # other parent | ||
Siddharth Agarwal
|
r18034 | or fn in copymap): | ||
Matt Mackall
|
r5003 | madd(fn) | ||
Matt Mackall
|
r17733 | elif ((time != mtime and time != mtime & _rangemask) | ||
Siddharth Agarwal
|
r18034 | and (mode & lnkkind != lnkkind or checklink)): | ||
Matt Mackall
|
r5003 | ladd(fn) | ||
Siddharth Agarwal
|
r18034 | elif mtime == lastnormaltime: | ||
Adrian Buehlmann
|
r13763 | # fn may have been changed in the same timeslot without | ||
# changing its size. This can happen if we quickly do | ||||
# multiple commits in a single transaction. | ||||
# Force lookup, so we don't miss such a racy file change. | ||||
Greg Ward
|
r13704 | 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) | ||||