##// END OF EJS Templates
dirstate: ignore symlinks when fs cannot handle them (issue1888)...
dirstate: ignore symlinks when fs cannot handle them (issue1888) When the filesystem cannot handle the executable bit, we currently ignore it completely when looking for modified files. Similarly, it is impossible to set or clear the bit when the filesystem ignores it. This patch makes Mercurial treat symbolic links the same way. Symlinks are a little different since they manifest themselves as small files containing a filename (the symlink target). On Windows, these files show up as regular files, and on Linux and Mac they show up as real symlinks. Issue1888 presents a case where the symlink files are better ignored from the Windows side. A Linux client creates symlinks in a working copy which is shared over a network between Linux and Windows clients. The Samba server is helpful and defererences the symlink when the Windows client looks at it. This means that Mercurial on the Windows side sees file content instead of a file name in the symlink, and hence flags the link as modified. Ignoring the change would be much more helpful, similarly to how Mercurial does not report any changes when executable bits are ignored in a checkout on Windows. An initial checkout of a symbolic link on a file system that cannot handle symbolic links will still result in a regular file containing the target file name as its content. Sharing such a checkout with a Linux client will not turn the file into a symlink automatically, but 'hg revert' can fix that. After the revert, the Windows client will see the correct file content (provided by the Samba server when it follows the link on the Linux side) and otherwise ignore the change. Running 'hg perfstatus' 10 times gives these results: Before: After: min: 0.544703 min: 0.546549 med: 0.547592 med: 0.548881 avg: 0.549146 avg: 0.548549 max: 0.564112 max: 0.551504 The median time is increased about 0.24%.

File last commit:

r10577:d5bd1bef stable
r11769:ca6cebd8 stable
Show More
store.py
333 lines | 11.1 KiB | text/x-python | PythonLexer
Adrian Buehlmann
move filename encoding functions from util.py to new store.py
r6839 # store.py - repository store handling for Mercurial
#
# Copyright 2008 Matt Mackall <mpm@selenic.com>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Adrian Buehlmann
move filename encoding functions from util.py to new store.py
r6839
Adrian Buehlmann
introduce fncache repository layout...
r7229 from i18n import _
Simon Heimberg
separate import lines from mercurial and general python modules
r8312 import osutil, util
import os, stat
Adrian Buehlmann
introduce store classes...
r6840
Adrian Buehlmann
introduce fncache repository layout...
r7229 _sha = util.sha1
Benoit Boissinot
filelog encoding: move the encoding/decoding into store...
r8531 # This avoids a collision between a file named foo and a dir named
# foo.i or foo.d
def encodedir(path):
if not path.startswith('data/'):
return path
return (path
.replace(".hg/", ".hg.hg/")
.replace(".i/", ".i.hg/")
.replace(".d/", ".d.hg/"))
def decodedir(path):
if not path.startswith('data/'):
return path
return (path
.replace(".d.hg/", ".d/")
.replace(".i.hg/", ".i/")
.replace(".hg.hg/", ".hg/"))
Adrian Buehlmann
move filename encoding functions from util.py to new store.py
r6839 def _buildencodefun():
e = '_'
win_reserved = [ord(x) for x in '\\:*?"<>|']
Matt Mackall
many, many trivial check-code fixups
r10282 cmap = dict([(chr(x), chr(x)) for x in xrange(127)])
Adrian Buehlmann
move filename encoding functions from util.py to new store.py
r6839 for x in (range(32) + range(126, 256) + win_reserved):
cmap[chr(x)] = "~%02x" % x
for x in range(ord("A"), ord("Z")+1) + [ord(e)]:
cmap[chr(x)] = e + chr(x).lower()
dmap = {}
for k, v in cmap.iteritems():
dmap[v] = k
def decode(s):
i = 0
while i < len(s):
for l in xrange(1, 4):
try:
Matt Mackall
many, many trivial check-code fixups
r10282 yield dmap[s[i:i + l]]
Adrian Buehlmann
move filename encoding functions from util.py to new store.py
r6839 i += l
break
except KeyError:
pass
else:
raise KeyError
Benoit Boissinot
filelog encoding: move the encoding/decoding into store...
r8531 return (lambda s: "".join([cmap[c] for c in encodedir(s)]),
lambda s: decodedir("".join(list(decode(s)))))
Adrian Buehlmann
move filename encoding functions from util.py to new store.py
r6839
encodefilename, decodefilename = _buildencodefun()
Adrian Buehlmann
introduce fncache repository layout...
r7229 def _build_lower_encodefun():
win_reserved = [ord(x) for x in '\\:*?"<>|']
Matt Mackall
many, many trivial check-code fixups
r10282 cmap = dict([(chr(x), chr(x)) for x in xrange(127)])
Adrian Buehlmann
introduce fncache repository layout...
r7229 for x in (range(32) + range(126, 256) + win_reserved):
cmap[chr(x)] = "~%02x" % x
for x in range(ord("A"), ord("Z")+1):
cmap[chr(x)] = chr(x).lower()
return lambda s: "".join([cmap[c] for c in s])
lowerencode = _build_lower_encodefun()
_windows_reserved_filenames = '''con prn aux nul
com1 com2 com3 com4 com5 com6 com7 com8 com9
lpt1 lpt2 lpt3 lpt4 lpt5 lpt6 lpt7 lpt8 lpt9'''.split()
def auxencode(path):
res = []
for n in path.split('/'):
if n:
base = n.split('.')[0]
if base and (base in _windows_reserved_filenames):
# encode third letter ('aux' -> 'au~78')
ec = "~%02x" % ord(n[2])
n = n[0:2] + ec + n[3:]
Adrian Buehlmann
store: encode trailing period and space on directory names (issue1417)...
r7515 if n[-1] in '. ':
# encode last period or space ('foo...' -> 'foo..~2e')
n = n[:-1] + "~%02x" % ord(n[-1])
Adrian Buehlmann
introduce fncache repository layout...
r7229 res.append(n)
return '/'.join(res)
MAX_PATH_LEN_IN_HGSTORE = 120
DIR_PREFIX_LEN = 8
_MAX_SHORTENED_DIRS_LEN = 8 * (DIR_PREFIX_LEN + 1) - 4
def hybridencode(path):
'''encodes path with a length limit
Encodes all paths that begin with 'data/', according to the following.
Default encoding (reversible):
Encodes all uppercase letters 'X' as '_x'. All reserved or illegal
characters are encoded as '~xx', where xx is the two digit hex code
of the character (see encodefilename).
Relevant path components consisting of Windows reserved filenames are
masked by encoding the third character ('aux' -> 'au~78', see auxencode).
Hashed encoding (not reversible):
If the default-encoded path is longer than MAX_PATH_LEN_IN_HGSTORE, a
non-reversible hybrid hashing of the path is done instead.
This encoding uses up to DIR_PREFIX_LEN characters of all directory
levels of the lowerencoded path, but not more levels than can fit into
_MAX_SHORTENED_DIRS_LEN.
Then follows the filler followed by the sha digest of the full path.
The filler is the beginning of the basename of the lowerencoded path
(the basename is everything after the last path separator). The filler
is as long as possible, filling in characters from the basename until
the encoded path has MAX_PATH_LEN_IN_HGSTORE characters (or all chars
of the basename have been taken).
The extension (e.g. '.i' or '.d') is preserved.
The string 'data/' at the beginning is replaced with 'dh/', if the hashed
encoding was used.
'''
if not path.startswith('data/'):
return path
Benoit Boissinot
filelog encoding: move the encoding/decoding into store...
r8531 # escape directories ending with .i and .d
path = encodedir(path)
Adrian Buehlmann
introduce fncache repository layout...
r7229 ndpath = path[len('data/'):]
res = 'data/' + auxencode(encodefilename(ndpath))
if len(res) > MAX_PATH_LEN_IN_HGSTORE:
digest = _sha(path).hexdigest()
aep = auxencode(lowerencode(ndpath))
_root, ext = os.path.splitext(aep)
parts = aep.split('/')
basename = parts[-1]
sdirs = []
for p in parts[:-1]:
d = p[:DIR_PREFIX_LEN]
Adrian Buehlmann
store: don't create dirs ending in period or space for hashed paths (issue1417)...
r7514 if d[-1] in '. ':
# Windows can't access dirs ending in period or space
d = d[:-1] + '_'
Adrian Buehlmann
introduce fncache repository layout...
r7229 t = '/'.join(sdirs) + '/' + d
if len(t) > _MAX_SHORTENED_DIRS_LEN:
break
sdirs.append(d)
dirs = '/'.join(sdirs)
if len(dirs) > 0:
dirs += '/'
res = 'dh/' + dirs + digest + ext
space_left = MAX_PATH_LEN_IN_HGSTORE - len(res)
if space_left > 0:
filler = basename[:space_left]
res = 'dh/' + dirs + filler + digest + ext
return res
Matt Mackall
store: simplify class hierarchy
r6898 def _calcmode(path):
try:
# files in .hg/ will be created using this mode
mode = os.stat(path).st_mode
# avoid some useless chmods
Matt Mackall
util: split out posix, windows, and win32 modules
r7890 if (0777 & ~util.umask) == (0777 & mode):
Matt Mackall
store: simplify class hierarchy
r6898 mode = None
except OSError:
mode = None
return mode
Matt Mackall
clone: get a list of files to clone from store
r6903 _data = 'data 00manifest.d 00manifest.i 00changelog.d 00changelog.i'
Benoit Boissinot
use new style classes
r8778 class basicstore(object):
Adrian Buehlmann
introduce store classes...
r6840 '''base class for local repository stores'''
Adrian Buehlmann
Fix for Issue1260
r6988 def __init__(self, path, opener, pathjoiner):
self.pathjoiner = pathjoiner
Adrian Buehlmann
introduce store classes...
r6840 self.path = path
Matt Mackall
store: simplify class hierarchy
r6898 self.createmode = _calcmode(path)
Benoit Boissinot
store encoding: .i/.d encoding for non-store repo (broken by 810387f59696)
r8633 op = opener(self.path)
op.createmode = self.createmode
self.opener = lambda f, *args, **kw: op(encodedir(f), *args, **kw)
Adrian Buehlmann
introduce store classes...
r6840
def join(self, f):
Benoit Boissinot
filelog encoding: move the encoding/decoding into store...
r8531 return self.pathjoiner(self.path, encodedir(f))
Adrian Buehlmann
introduce store classes...
r6840
Matt Mackall
store: simplify walking...
r6899 def _walk(self, relpath, recurse):
Matt Mackall
store: change handling of decoding errors
r6900 '''yields (unencoded, encoded, size)'''
Adrian Buehlmann
Fix for Issue1260
r6988 path = self.pathjoiner(self.path, relpath)
Adrian Buehlmann
introduce store classes...
r6840 striplen = len(self.path) + len(os.sep)
Matt Mackall
store: simplify walking...
r6899 l = []
if os.path.isdir(path):
visit = [path]
while visit:
p = visit.pop()
for f, kind, st in osutil.listdir(p, stat=True):
Adrian Buehlmann
Fix for Issue1260
r6988 fp = self.pathjoiner(p, f)
Matt Mackall
store: simplify walking...
r6899 if kind == stat.S_IFREG and f[-2:] in ('.d', '.i'):
Matt Mackall
store: change handling of decoding errors
r6900 n = util.pconvert(fp[striplen:])
Benoit Boissinot
filelog encoding: move the encoding/decoding into store...
r8531 l.append((decodedir(n), n, st.st_size))
Matt Mackall
store: simplify walking...
r6899 elif kind == stat.S_IFDIR and recurse:
visit.append(fp)
Matt Mackall
replace util.sort with sorted built-in...
r8209 return sorted(l)
Adrian Buehlmann
introduce store classes...
r6840
Matt Mackall
store: change handling of decoding errors
r6900 def datafiles(self):
Matt Mackall
store: simplify walking...
r6899 return self._walk('data', True)
Adrian Buehlmann
introduce store classes...
r6840
def walk(self):
Matt Mackall
store: change handling of decoding errors
r6900 '''yields (unencoded, encoded, size)'''
Adrian Buehlmann
introduce store classes...
r6840 # yield data files first
Adrian Buehlmann
verify: check repo.store
r6892 for x in self.datafiles():
Adrian Buehlmann
introduce store classes...
r6840 yield x
# yield manifest before changelog
Matt Mackall
replace various uses of list.reverse()
r8210 for x in reversed(self._walk('', False)):
Adrian Buehlmann
introduce store classes...
r6840 yield x
Matt Mackall
clone: get a list of files to clone from store
r6903 def copylist(self):
return ['requires'] + _data.split()
Matt Mackall
store: simplify class hierarchy
r6898 class encodedstore(basicstore):
Adrian Buehlmann
Fix for Issue1260
r6988 def __init__(self, path, opener, pathjoiner):
self.pathjoiner = pathjoiner
self.path = self.pathjoiner(path, 'store')
Matt Mackall
store: simplify class hierarchy
r6898 self.createmode = _calcmode(self.path)
Matt Mackall
store: take opener as an argument
r6896 op = opener(self.path)
Adrian Buehlmann
introduce store classes...
r6840 op.createmode = self.createmode
Matt Mackall
store: drop self.encodefn
r6902 self.opener = lambda f, *args, **kw: op(encodefilename(f), *args, **kw)
Adrian Buehlmann
introduce store classes...
r6840
Matt Mackall
store: change handling of decoding errors
r6900 def datafiles(self):
for a, b, size in self._walk('data', True):
Adrian Buehlmann
verify: check repo.store
r6892 try:
Matt Mackall
store: change handling of decoding errors
r6900 a = decodefilename(a)
Adrian Buehlmann
verify: check repo.store
r6892 except KeyError:
Matt Mackall
store: change handling of decoding errors
r6900 a = None
yield a, b, size
Adrian Buehlmann
introduce store classes...
r6840
def join(self, f):
Adrian Buehlmann
Fix for Issue1260
r6988 return self.pathjoiner(self.path, encodefilename(f))
Adrian Buehlmann
introduce store classes...
r6840
Matt Mackall
clone: get a list of files to clone from store
r6903 def copylist(self):
return (['requires', '00changelog.i'] +
Adrian Buehlmann
Fix for Issue1260
r6988 [self.pathjoiner('store', f) for f in _data.split()])
Matt Mackall
clone: get a list of files to clone from store
r6903
Benoit Boissinot
store: refactor the fncache handling...
r8530 class fncache(object):
Benoit Boissinot
filelog encoding: move the encoding/decoding into store...
r8531 # the filename used to be partially encoded
# hence the encodedir/decodedir dance
Adrian Buehlmann
introduce fncache repository layout...
r7229 def __init__(self, opener):
self.opener = opener
self.entries = None
Benoit Boissinot
store: refactor the fncache handling...
r8530 def _load(self):
'''fill the entries from the fncache file'''
self.entries = set()
try:
fp = self.opener('fncache', mode='rb')
except IOError:
# skip nonexistent file
return
for n, line in enumerate(fp):
if (len(line) < 2) or (line[-1] != '\n'):
t = _('invalid entry in fncache, line %s') % (n + 1)
raise util.Abort(t)
Benoit Boissinot
filelog encoding: move the encoding/decoding into store...
r8531 self.entries.add(decodedir(line[:-1]))
Benoit Boissinot
store: refactor the fncache handling...
r8530 fp.close()
Adrian Buehlmann
introduce fncache repository layout...
r7229
Benoit Boissinot
store: refactor the fncache handling...
r8530 def rewrite(self, files):
fp = self.opener('fncache', mode='wb')
for p in files:
Benoit Boissinot
filelog encoding: move the encoding/decoding into store...
r8531 fp.write(encodedir(p) + '\n')
Benoit Boissinot
store: refactor the fncache handling...
r8530 fp.close()
self.entries = set(files)
def add(self, fn):
if self.entries is None:
self._load()
Adrian Buehlmann
store: only add new entries to the fncache file...
r10577 if fn not in self.entries:
self.opener('fncache', 'ab').write(encodedir(fn) + '\n')
self.entries.add(fn)
Benoit Boissinot
store: refactor the fncache handling...
r8530
def __contains__(self, fn):
if self.entries is None:
self._load()
return fn in self.entries
def __iter__(self):
if self.entries is None:
self._load()
return iter(self.entries)
Adrian Buehlmann
introduce fncache repository layout...
r7229
class fncachestore(basicstore):
def __init__(self, path, opener, pathjoiner):
self.pathjoiner = pathjoiner
self.path = self.pathjoiner(path, 'store')
self.createmode = _calcmode(self.path)
Simon Heimberg
store: eliminate reference cycle in fncachestore...
r9133 op = opener(self.path)
op.createmode = self.createmode
fnc = fncache(op)
self.fncache = fnc
Benoit Boissinot
store: refactor the fncache handling...
r8530
def fncacheopener(path, mode='r', *args, **kw):
Adrian Buehlmann
store: only add new entries to the fncache file...
r10577 if mode not in ('r', 'rb') and path.startswith('data/'):
Benoit Boissinot
fix spaces/identation issues
r10339 fnc.add(path)
Simon Heimberg
store: eliminate reference cycle in fncachestore...
r9133 return op(hybridencode(path), mode, *args, **kw)
Benoit Boissinot
store: refactor the fncache handling...
r8530 self.opener = fncacheopener
Adrian Buehlmann
introduce fncache repository layout...
r7229
def join(self, f):
return self.pathjoiner(self.path, hybridencode(f))
def datafiles(self):
rewrite = False
existing = []
pjoin = self.pathjoiner
spath = self.path
Benoit Boissinot
store: refactor the fncache handling...
r8530 for f in self.fncache:
Adrian Buehlmann
introduce fncache repository layout...
r7229 ef = hybridencode(f)
try:
st = os.stat(pjoin(spath, ef))
yield f, ef, st.st_size
existing.append(f)
except OSError:
# nonexistent entry
rewrite = True
if rewrite:
# rewrite fncache to remove nonexistent entries
# (may be caused by rollback / strip)
Benoit Boissinot
store: refactor the fncache handling...
r8530 self.fncache.rewrite(existing)
Adrian Buehlmann
introduce fncache repository layout...
r7229
def copylist(self):
Thomas Arendsen Hein
Remove trailing spaces.
r7236 d = _data + ' dh fncache'
Adrian Buehlmann
introduce fncache repository layout...
r7229 return (['requires', '00changelog.i'] +
[self.pathjoiner('store', f) for f in d.split()])
Patrick Mezard
store: pathjoiner default value is os.path.join
r6989 def store(requirements, path, opener, pathjoiner=None):
pathjoiner = pathjoiner or os.path.join
Matt Mackall
store: simplify class hierarchy
r6898 if 'store' in requirements:
Adrian Buehlmann
introduce fncache repository layout...
r7229 if 'fncache' in requirements:
return fncachestore(path, opener, pathjoiner)
Adrian Buehlmann
Fix for Issue1260
r6988 return encodedstore(path, opener, pathjoiner)
return basicstore(path, opener, pathjoiner)