##// END OF EJS Templates
parsers: inline fields of dirstate values in C version...
parsers: inline fields of dirstate values in C version Previously, while unpacking the dirstate we'd create 3-4 new CPython objects for most dirstate values: - the state is a single character string, which is pooled by CPython - the mode is a new object if it isn't 0 due to being in the lookup set - the size is a new object if it is greater than 255 - the mtime is a new object if it isn't -1 due to being in the lookup set - the tuple to contain them all In some cases such as regular hg status, we actually look at all the objects. In other cases like hg add, hg status for a subdirectory, or hg status with the third-party hgwatchman enabled, we look at almost none of the objects. This patch eliminates most object creation in these cases by defining a custom C struct that is exposed to Python with an interface similar to a tuple. Only when tuple elements are actually requested are the respective objects created. The gains, where they're expected, are significant. The following tests are run against a working copy with over 270,000 files. parse_dirstate becomes significantly faster: $ hg perfdirstate before: wall 0.186437 comb 0.180000 user 0.160000 sys 0.020000 (best of 35) after: wall 0.093158 comb 0.100000 user 0.090000 sys 0.010000 (best of 95) and as a result, several commands benefit: $ time hg status # with hgwatchman enabled before: 0.42s user 0.14s system 99% cpu 0.563 total after: 0.34s user 0.12s system 99% cpu 0.471 total $ time hg add new-file before: 0.85s user 0.18s system 99% cpu 1.033 total after: 0.76s user 0.17s system 99% cpu 0.931 total There is a slight regression in regular status performance, but this is fixed in an upcoming patch.

File last commit:

r20929:afe0b48e default
r21809:e250b830 default
Show More
store.py
542 lines | 16.5 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 _
FUJIWARA Katsunori
store: invoke "osutil.listdir()" via vfs...
r17747 import scmutil, util, parsers
Bryan O'Sullivan
store: only one kind of OSError means "nonexistent entry"
r17374 import os, stat, errno
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
Adrian Buehlmann
store: use fast C implementation of encodedir() if it's available...
r17607 def _encodedir(path):
Adrian Buehlmann
store: add some doctests
r13949 '''
Adrian Buehlmann
store: use fast C implementation of encodedir() if it's available...
r17607 >>> _encodedir('data/foo.i')
Adrian Buehlmann
store: add some doctests
r13949 'data/foo.i'
Adrian Buehlmann
store: use fast C implementation of encodedir() if it's available...
r17607 >>> _encodedir('data/foo.i/bla.i')
Adrian Buehlmann
store: add some doctests
r13949 'data/foo.i.hg/bla.i'
Adrian Buehlmann
store: use fast C implementation of encodedir() if it's available...
r17607 >>> _encodedir('data/foo.i.hg/bla.i')
Adrian Buehlmann
store: add some doctests
r13949 'data/foo.i.hg.hg/bla.i'
Adrian Buehlmann
store: use fast C implementation of encodedir() if it's available...
r17607 >>> _encodedir('data/foo.i\\ndata/foo.i/bla.i\\ndata/foo.i.hg/bla.i\\n')
Adrian Buehlmann
store: add multiline doctest case for encodedir()...
r17605 'data/foo.i\\ndata/foo.i.hg/bla.i\\ndata/foo.i.hg.hg/bla.i\\n'
Adrian Buehlmann
store: add some doctests
r13949 '''
Benoit Boissinot
filelog encoding: move the encoding/decoding into store...
r8531 return (path
.replace(".hg/", ".hg.hg/")
.replace(".i/", ".i.hg/")
.replace(".d/", ".d.hg/"))
Adrian Buehlmann
store: use fast C implementation of encodedir() if it's available...
r17607 encodedir = getattr(parsers, 'encodedir', _encodedir)
Benoit Boissinot
filelog encoding: move the encoding/decoding into store...
r8531 def decodedir(path):
Adrian Buehlmann
store: add some doctests
r13949 '''
>>> decodedir('data/foo.i')
'data/foo.i'
>>> decodedir('data/foo.i.hg/bla.i')
'data/foo.i/bla.i'
>>> decodedir('data/foo.i.hg.hg/bla.i')
'data/foo.i.hg/bla.i'
'''
Adrian Buehlmann
store: remove uneeded startswith('data/') checks in encodedir() and decodedir()...
r17586 if ".hg/" not in path:
Benoit Boissinot
filelog encoding: move the encoding/decoding into store...
r8531 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():
Adrian Buehlmann
store: add some doctests
r13949 '''
>>> enc, dec = _buildencodefun()
>>> enc('nothing/special.txt')
'nothing/special.txt'
>>> dec('nothing/special.txt')
'nothing/special.txt'
>>> enc('HELLO')
'_h_e_l_l_o'
>>> dec('_h_e_l_l_o')
'HELLO'
>>> enc('hello:world?')
'hello~3aworld~3f'
>>> dec('hello~3aworld~3f')
'hello:world?'
>>> enc('the\x07quick\xADshot')
'the~07quick~adshot'
>>> dec('the~07quick~adshot')
'the\\x07quick\\xadshot'
'''
Adrian Buehlmann
move filename encoding functions from util.py to new store.py
r6839 e = '_'
Adrian Buehlmann
store: change names to comply with project coding standards...
r14288 winreserved = [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
store: change names to comply with project coding standards...
r14288 for x in (range(32) + range(126, 256) + winreserved):
Adrian Buehlmann
move filename encoding functions from util.py to new store.py
r6839 cmap[chr(x)] = "~%02x" % x
Mads Kiilerich
check-code: there must also be whitespace between ')' and operator...
r18054 for x in range(ord("A"), ord("Z") + 1) + [ord(e)]:
Adrian Buehlmann
move filename encoding functions from util.py to new store.py
r6839 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
Adrian Buehlmann
store: extract functions _encodefname and _decodefname
r17608 return (lambda s: ''.join([cmap[c] for c in s]),
lambda s: ''.join(list(decode(s))))
_encodefname, _decodefname = _buildencodefun()
Adrian Buehlmann
move filename encoding functions from util.py to new store.py
r6839
Adrian Buehlmann
store: extract functions _encodefname and _decodefname
r17608 def encodefilename(s):
'''
>>> encodefilename('foo.i/bar.d/bla.hg/hi:world?/HELLO')
'foo.i.hg/bar.d.hg/bla.hg.hg/hi~3aworld~3f/_h_e_l_l_o'
'''
return _encodefname(encodedir(s))
def decodefilename(s):
'''
>>> decodefilename('foo.i.hg/bar.d.hg/bla.hg.hg/hi~3aworld~3f/_h_e_l_l_o')
'foo.i/bar.d/bla.hg/hi:world?/HELLO'
'''
return decodedir(_decodefname(s))
Adrian Buehlmann
move filename encoding functions from util.py to new store.py
r6839
Adrian Buehlmann
store: change names to comply with project coding standards...
r14288 def _buildlowerencodefun():
Adrian Buehlmann
store: add some doctests
r13949 '''
Adrian Buehlmann
store: change names to comply with project coding standards...
r14288 >>> f = _buildlowerencodefun()
Adrian Buehlmann
store: add some doctests
r13949 >>> f('nothing/special.txt')
'nothing/special.txt'
>>> f('HELLO')
'hello'
>>> f('hello:world?')
'hello~3aworld~3f'
>>> f('the\x07quick\xADshot')
'the~07quick~adshot'
'''
Adrian Buehlmann
store: change names to comply with project coding standards...
r14288 winreserved = [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
store: change names to comply with project coding standards...
r14288 for x in (range(32) + range(126, 256) + winreserved):
Adrian Buehlmann
introduce fncache repository layout...
r7229 cmap[chr(x)] = "~%02x" % x
Mads Kiilerich
check-code: there must also be whitespace between ')' and operator...
r18054 for x in range(ord("A"), ord("Z") + 1):
Adrian Buehlmann
introduce fncache repository layout...
r7229 cmap[chr(x)] = chr(x).lower()
return lambda s: "".join([cmap[c] for c in s])
Bryan O'Sullivan
store: implement lowerencode in C
r18430 lowerencode = getattr(parsers, 'lowerencode', None) or _buildlowerencodefun()
Adrian Buehlmann
introduce fncache repository layout...
r7229
Adrian Buehlmann
store: optimze _auxencode() a bit by grouping the reserved names by length...
r17570 # Windows reserved names: con, prn, aux, nul, com1..com9, lpt1..lpt9
_winres3 = ('aux', 'con', 'prn', 'nul') # length 3
_winres4 = ('com', 'lpt') # length 4 (with trailing 1..9)
Adrian Buehlmann
store: encode first period or space in filenames (issue1713)...
r12687 def _auxencode(path, dotencode):
Adrian Buehlmann
store: add some doctests
r13949 '''
Encodes filenames containing names reserved by Windows or which end in
period or space. Does not touch other single reserved characters c.
Specifically, c in '\\:*?"<>|' or ord(c) <= 31 are *not* encoded here.
Additionally encodes space or period at the beginning, if dotencode is
Adrian Buehlmann
store: explain "aux.foo" versus "foo.aux" in doc of _auxencode()
r17569 True. Parameter path is assumed to be all lowercase.
A segment only needs encoding if a reserved name appears as a
basename (e.g. "aux", "aux.foo"). A directory or file named "foo.aux"
doesn't need encoding.
Adrian Buehlmann
store: add some doctests
r13949
Adrian Buehlmann
store: parameter path of _auxencode is now a list of strings
r17589 >>> s = '.foo/aux.txt/txt.aux/con/prn/nul/foo.'
>>> _auxencode(s.split('/'), True)
Adrian Buehlmann
store: let _auxencode() return the list of path segments...
r17574 ['~2efoo', 'au~78.txt', 'txt.aux', 'co~6e', 'pr~6e', 'nu~6c', 'foo~2e']
Adrian Buehlmann
store: parameter path of _auxencode is now a list of strings
r17589 >>> s = '.com1com2/lpt9.lpt4.lpt1/conprn/com0/lpt0/foo.'
>>> _auxencode(s.split('/'), False)
Adrian Buehlmann
store: let _auxencode() return the list of path segments...
r17574 ['.com1com2', 'lp~749.lpt4.lpt1', 'conprn', 'com0', 'lpt0', 'foo~2e']
Adrian Buehlmann
store: parameter path of _auxencode is now a list of strings
r17589 >>> _auxencode(['foo. '], True)
Adrian Buehlmann
store: let _auxencode() return the list of path segments...
r17574 ['foo.~20']
Adrian Buehlmann
store: parameter path of _auxencode is now a list of strings
r17589 >>> _auxencode([' .foo'], True)
Adrian Buehlmann
store: let _auxencode() return the list of path segments...
r17574 ['~20.foo']
Adrian Buehlmann
store: add some doctests
r13949 '''
Adrian Buehlmann
store: parameter path of _auxencode is now a list of strings
r17589 for i, n in enumerate(path):
Adrian Buehlmann
store: unindent most of the contents of the for loop in _auxencode()...
r17572 if not n:
continue
if dotencode and n[0] in '. ':
n = "~%02x" % ord(n[0]) + n[1:]
Adrian Buehlmann
store: parameter path of _auxencode is now a list of strings
r17589 path[i] = n
Adrian Buehlmann
store: unindent most of the contents of the for loop in _auxencode()...
r17572 else:
l = n.find('.')
if l == -1:
l = len(n)
if ((l == 3 and n[:3] in _winres3) or
(l == 4 and n[3] <= '9' and n[3] >= '1'
and n[:3] in _winres4)):
# encode third letter ('aux' -> 'au~78')
ec = "~%02x" % ord(n[2])
n = n[0:2] + ec + n[3:]
Adrian Buehlmann
store: parameter path of _auxencode is now a list of strings
r17589 path[i] = n
Adrian Buehlmann
store: unindent most of the contents of the for loop in _auxencode()...
r17572 if n[-1] in '. ':
# encode last period or space ('foo...' -> 'foo..~2e')
Adrian Buehlmann
store: parameter path of _auxencode is now a list of strings
r17589 path[i] = n[:-1] + "~%02x" % ord(n[-1])
return path
Adrian Buehlmann
introduce fncache repository layout...
r7229
Adrian Buehlmann
store: change names to comply with project coding standards...
r14288 _maxstorepathlen = 120
_dirprefixlen = 8
_maxshortdirslen = 8 * (_dirprefixlen + 1) - 4
Bryan O'Sullivan
store: refactor hashed encoding into its own function
r17610
def _hashencode(path, dotencode):
digest = _sha(path).hexdigest()
le = lowerencode(path).split('/')[1:]
parts = _auxencode(le, dotencode)
basename = parts[-1]
_root, ext = os.path.splitext(basename)
sdirs = []
sdirslen = 0
for p in parts[:-1]:
d = p[:_dirprefixlen]
if d[-1] in '. ':
# Windows can't access dirs ending in period or space
d = d[:-1] + '_'
if sdirslen == 0:
t = len(d)
else:
t = sdirslen + 1 + len(d)
if t > _maxshortdirslen:
break
sdirs.append(d)
sdirslen = t
dirs = '/'.join(sdirs)
if len(dirs) > 0:
dirs += '/'
res = 'dh/' + dirs + digest + ext
spaceleft = _maxstorepathlen - len(res)
if spaceleft > 0:
filler = basename[:spaceleft]
res = 'dh/' + dirs + filler + digest + ext
return res
Adrian Buehlmann
store: eliminate one level of lambda functions on _hybridencode
r17590 def _hybridencode(path, dotencode):
Adrian Buehlmann
introduce fncache repository layout...
r7229 '''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
Mads Kiilerich
spelling: fix minor spell checker issues
r17738 masked by encoding the third character ('aux' -> 'au~78', see _auxencode).
Adrian Buehlmann
introduce fncache repository layout...
r7229
Hashed encoding (not reversible):
Adrian Buehlmann
store: change names to comply with project coding standards...
r14288 If the default-encoded path is longer than _maxstorepathlen, a
Adrian Buehlmann
introduce fncache repository layout...
r7229 non-reversible hybrid hashing of the path is done instead.
Adrian Buehlmann
store: change names to comply with project coding standards...
r14288 This encoding uses up to _dirprefixlen characters of all directory
Adrian Buehlmann
introduce fncache repository layout...
r7229 levels of the lowerencoded path, but not more levels than can fit into
Adrian Buehlmann
store: change names to comply with project coding standards...
r14288 _maxshortdirslen.
Adrian Buehlmann
introduce fncache repository layout...
r7229 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
Adrian Buehlmann
store: change names to comply with project coding standards...
r14288 the encoded path has _maxstorepathlen characters (or all chars of the
basename have been taken).
Adrian Buehlmann
introduce fncache repository layout...
r7229 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.
'''
Adrian Buehlmann
store: reuse direncoded path in _hybridencode...
r17609 path = encodedir(path)
ef = _encodefname(path).split('/')
Adrian Buehlmann
store: eliminate one level of lambda functions on _hybridencode
r17590 res = '/'.join(_auxencode(ef, dotencode))
Adrian Buehlmann
store: change names to comply with project coding standards...
r14288 if len(res) > _maxstorepathlen:
Bryan O'Sullivan
store: refactor hashed encoding into its own function
r17610 res = _hashencode(path, dotencode)
Adrian Buehlmann
introduce fncache repository layout...
r7229 return res
Adrian Buehlmann
store: add a fallback _pathencode Python function...
r17624 def _pathencode(path):
Bryan O'Sullivan
store: switch to C-based hashed path encoding
r18435 de = encodedir(path)
Adrian Buehlmann
store: optimize _pathencode by checking the length of the unencoded path...
r17693 if len(path) > _maxstorepathlen:
Bryan O'Sullivan
store: switch to C-based hashed path encoding
r18435 return _hashencode(de, True)
ef = _encodefname(de).split('/')
Adrian Buehlmann
store: add a fallback _pathencode Python function...
r17624 res = '/'.join(_auxencode(ef, True))
if len(res) > _maxstorepathlen:
Bryan O'Sullivan
store: switch to C-based hashed path encoding
r18435 return _hashencode(de, True)
Adrian Buehlmann
store: add a fallback _pathencode Python function...
r17624 return res
_pathencode = getattr(parsers, 'pathencode', _pathencode)
Adrian Buehlmann
store: move _plainhybridencode and _dothybridencode higher up in the file...
r17623 def _plainhybridencode(f):
return _hybridencode(f, False)
FUJIWARA Katsunori
store: invoke "os.stat()" for "createmode" initialization via vfs...
r17726 def _calcmode(vfs):
Matt Mackall
store: simplify class hierarchy
r6898 try:
# files in .hg/ will be created using this mode
FUJIWARA Katsunori
store: invoke "os.stat()" for "createmode" initialization via vfs...
r17726 mode = vfs.stat().st_mode
Matt Mackall
store: simplify class hierarchy
r6898 # 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
Pierre-Yves.David@ens-lyon.org
clone: copy obsolete markers during local clone...
r17249 _data = ('data 00manifest.d 00manifest.i 00changelog.d 00changelog.i'
' phaseroots obsstore')
Matt Mackall
clone: get a list of files to clone from store
r6903
Benoit Boissinot
use new style classes
r8778 class basicstore(object):
Adrian Buehlmann
introduce store classes...
r6840 '''base class for local repository stores'''
FUJIWARA Katsunori
store: rename "openertype" argument to "vfstype"
r17651 def __init__(self, path, vfstype):
FUJIWARA Katsunori
store: initialize vfs field first to use it for initialization of others...
r17724 vfs = vfstype(path)
self.path = vfs.base
FUJIWARA Katsunori
store: invoke "os.stat()" for "createmode" initialization via vfs...
r17726 self.createmode = _calcmode(vfs)
FUJIWARA Katsunori
store: rename "op" variables to "vfs"
r17652 vfs.createmode = self.createmode
FUJIWARA Katsunori
store: invoke "os.path.isdir()" via vfs...
r17728 self.rawvfs = vfs
FUJIWARA Katsunori
store: initialize "vfs" fields by "vfs" constructors...
r17653 self.vfs = scmutil.filtervfs(vfs, encodedir)
self.opener = self.vfs
Adrian Buehlmann
introduce store classes...
r6840
def join(self, f):
Adrian Buehlmann
store: remove pointless pathjoiner parameter...
r13426 return 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
store: remove pointless pathjoiner parameter...
r13426 path = self.path
if relpath:
path += '/' + relpath
striplen = len(self.path) + 1
Matt Mackall
store: simplify walking...
r6899 l = []
FUJIWARA Katsunori
store: invoke "os.path.isdir()" via vfs...
r17728 if self.rawvfs.isdir(path):
Matt Mackall
store: simplify walking...
r6899 visit = [path]
FUJIWARA Katsunori
store: invoke "osutil.listdir()" via vfs...
r17747 readdir = self.rawvfs.readdir
Matt Mackall
store: simplify walking...
r6899 while visit:
p = visit.pop()
FUJIWARA Katsunori
store: invoke "osutil.listdir()" via vfs...
r17747 for f, kind, st in readdir(p, stat=True):
Adrian Buehlmann
store: remove pointless pathjoiner parameter...
r13426 fp = 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)
Bryan O'Sullivan
store: sort filenames in place
r17054 l.sort()
return 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
Durham Goode
store: move top file walk to a separate function...
r19177 def topfiles(self):
# yield manifest before changelog
return reversed(self._walk('', False))
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
Durham Goode
store: move top file walk to a separate function...
r19177 for x in self.topfiles():
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()
Durham Goode
fncache: move fncache writing to be in a transaction...
r20883 def write(self, tr):
Adrian Buehlmann
fncachestore: defer updating the fncache file to a single file open...
r13391 pass
Durham Goode
caches: invalidate store caches when lock is taken...
r20884 def invalidatecaches(self):
pass
Durham Goode
fncache: clean up fncache during strips...
r20885 def markremoved(self, fn):
pass
smuralid
store: add a contains method to basicstore...
r17744 def __contains__(self, path):
'''Checks if the store contains path'''
path = "/".join(("data", path))
# file?
FUJIWARA Katsunori
store: use "vfs.exists()" instead of "os.path.exists()"
r19903 if self.vfs.exists(path + ".i"):
smuralid
store: add a contains method to basicstore...
r17744 return True
# dir?
if not path.endswith("/"):
path = path + "/"
FUJIWARA Katsunori
store: use "vfs.exists()" instead of "os.path.exists()"
r19903 return self.vfs.exists(path)
smuralid
store: add a contains method to basicstore...
r17744
Matt Mackall
store: simplify class hierarchy
r6898 class encodedstore(basicstore):
FUJIWARA Katsunori
store: rename "openertype" argument to "vfstype"
r17651 def __init__(self, path, vfstype):
FUJIWARA Katsunori
store: initialize vfs field first to use it for initialization of others...
r17724 vfs = vfstype(path + '/store')
self.path = vfs.base
FUJIWARA Katsunori
store: invoke "os.stat()" for "createmode" initialization via vfs...
r17726 self.createmode = _calcmode(vfs)
FUJIWARA Katsunori
store: rename "op" variables to "vfs"
r17652 vfs.createmode = self.createmode
FUJIWARA Katsunori
store: invoke "os.path.isdir()" via vfs...
r17728 self.rawvfs = vfs
FUJIWARA Katsunori
store: initialize "vfs" fields by "vfs" constructors...
r17653 self.vfs = scmutil.filtervfs(vfs, encodefilename)
self.opener = self.vfs
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
store: remove pointless pathjoiner parameter...
r13426 return 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
store: remove pointless pathjoiner parameter...
r13426 ['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
FUJIWARA Katsunori
store: rename field name from "opener" to "vfs" in internal classes for fncache...
r17722 def __init__(self, vfs):
self.vfs = vfs
Adrian Buehlmann
introduce fncache repository layout...
r7229 self.entries = None
Adrian Buehlmann
fncachestore: defer updating the fncache file to a single file open...
r13391 self._dirty = False
Adrian Buehlmann
introduce fncache repository layout...
r7229
Benoit Boissinot
store: refactor the fncache handling...
r8530 def _load(self):
'''fill the entries from the fncache file'''
Adrian Buehlmann
fncachestore: defer updating the fncache file to a single file open...
r13391 self._dirty = False
Benoit Boissinot
store: refactor the fncache handling...
r8530 try:
FUJIWARA Katsunori
store: rename field name from "opener" to "vfs" in internal classes for fncache...
r17722 fp = self.vfs('fncache', mode='rb')
Benoit Boissinot
store: refactor the fncache handling...
r8530 except IOError:
# skip nonexistent file
Bryan O'Sullivan
store: speed up read and write of large fncache files...
r16404 self.entries = set()
Benoit Boissinot
store: refactor the fncache handling...
r8530 return
Adrian Buehlmann
store: optimize fncache._load a bit by dirdecoding the contents in one go...
r17604 self.entries = set(decodedir(fp.read()).splitlines())
Bryan O'Sullivan
store: speed up read and write of large fncache files...
r16404 if '' in self.entries:
fp.seek(0)
for n, line in enumerate(fp):
if not line.rstrip('\n'):
t = _('invalid entry in fncache, line %s') % (n + 1)
raise util.Abort(t)
Benoit Boissinot
store: refactor the fncache handling...
r8530 fp.close()
Adrian Buehlmann
introduce fncache repository layout...
r7229
Durham Goode
fncache: move fncache writing to be in a transaction...
r20883 def write(self, tr):
Bryan O'Sullivan
store: speed up read and write of large fncache files...
r16404 if self._dirty:
Durham Goode
fncache: move fncache writing to be in a transaction...
r20883 tr.addbackup('fncache')
Durham Goode
fncache: remove the rewriting logic...
r20879 fp = self.vfs('fncache', mode='wb', atomictemp=True)
if self.entries:
fp.write(encodedir('\n'.join(self.entries) + '\n'))
fp.close()
self._dirty = False
Benoit Boissinot
store: refactor the fncache handling...
r8530
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:
Adrian Buehlmann
fncachestore: defer updating the fncache file to a single file open...
r13391 self._dirty = True
Adrian Buehlmann
store: only add new entries to the fncache file...
r10577 self.entries.add(fn)
Benoit Boissinot
store: refactor the fncache handling...
r8530
Durham Goode
fncache: clean up fncache during strips...
r20885 def remove(self, fn):
if self.entries is None:
self._load()
try:
self.entries.remove(fn)
self._dirty = True
except KeyError:
pass
Adrian Buehlmann
store: move __contains__() implementation from class fncache into fncachestore...
r17782 def __contains__(self, fn):
Benoit Boissinot
store: refactor the fncache handling...
r8530 if self.entries is None:
self._load()
Adrian Buehlmann
store: move __contains__() implementation from class fncache into fncachestore...
r17782 return fn in self.entries
Benoit Boissinot
store: refactor the fncache handling...
r8530
def __iter__(self):
if self.entries is None:
self._load()
return iter(self.entries)
Adrian Buehlmann
introduce fncache repository layout...
r7229
Bryan O'Sullivan
scmutil: abstract out mustaudit delegation
r17845 class _fncachevfs(scmutil.abstractvfs, scmutil.auditvfs):
FUJIWARA Katsunori
store: rename argument name from "op"(ener) to "vfs"
r17721 def __init__(self, vfs, fnc, encode):
Bryan O'Sullivan
scmutil: abstract out mustaudit delegation
r17845 scmutil.auditvfs.__init__(self, vfs)
Adrian Buehlmann
store: break up reference cycle introduced in 9cbff8a39a2a...
r14194 self.fncache = fnc
self.encode = encode
def __call__(self, path, mode='r', *args, **kw):
if mode not in ('r', 'rb') and path.startswith('data/'):
self.fncache.add(path)
FUJIWARA Katsunori
store: rename field name from "opener" to "vfs" in internal classes for fncache...
r17722 return self.vfs(self.encode(path), mode, *args, **kw)
Adrian Buehlmann
store: break up reference cycle introduced in 9cbff8a39a2a...
r14194
FUJIWARA Katsunori
vfs: define "join()" in each classes derived from "abstractvfs"...
r17725 def join(self, path):
if path:
return self.vfs.join(self.encode(path))
else:
return self.vfs.join(path)
Adrian Buehlmann
introduce fncache repository layout...
r7229 class fncachestore(basicstore):
FUJIWARA Katsunori
store: rename "openertype" argument to "vfstype"
r17651 def __init__(self, path, vfstype, dotencode):
Adrian Buehlmann
store: move encode lambda logic into fncachestore...
r17591 if dotencode:
Bryan O'Sullivan
store: switch to C-based hashed path encoding
r18435 encode = _pathencode
Adrian Buehlmann
store: move encode lambda logic into fncachestore...
r17591 else:
encode = _plainhybridencode
Adrian Buehlmann
store: encode first period or space in filenames (issue1713)...
r12687 self.encode = encode
FUJIWARA Katsunori
store: initialize vfs field first to use it for initialization of others...
r17724 vfs = vfstype(path + '/store')
self.path = vfs.base
Bryan O'Sullivan
store: reduce string concatenation when joining...
r17562 self.pathsep = self.path + '/'
FUJIWARA Katsunori
store: invoke "os.stat()" for "createmode" initialization via vfs...
r17726 self.createmode = _calcmode(vfs)
FUJIWARA Katsunori
store: rename "op" variables to "vfs"
r17652 vfs.createmode = self.createmode
FUJIWARA Katsunori
store: replace invocation of "getsize()" by "vfs.stat()"...
r17727 self.rawvfs = vfs
FUJIWARA Katsunori
store: rename "op" variables to "vfs"
r17652 fnc = fncache(vfs)
Simon Heimberg
store: eliminate reference cycle in fncachestore...
r9133 self.fncache = fnc
FUJIWARA Katsunori
store: initialize "vfs" fields by "vfs" constructors...
r17653 self.vfs = _fncachevfs(vfs, fnc, encode)
self.opener = self.vfs
Adrian Buehlmann
introduce fncache repository layout...
r7229
def join(self, f):
Bryan O'Sullivan
store: reduce string concatenation when joining...
r17562 return self.pathsep + self.encode(f)
Adrian Buehlmann
introduce fncache repository layout...
r7229
Matt Mackall
store: restore getsize method...
r17731 def getsize(self, path):
return self.rawvfs.stat(path).st_size
Adrian Buehlmann
introduce fncache repository layout...
r7229 def datafiles(self):
Bryan O'Sullivan
store: sort the results of fncachestore.datafiles()
r17373 for f in sorted(self.fncache):
Adrian Buehlmann
store: encode first period or space in filenames (issue1713)...
r12687 ef = self.encode(f)
Adrian Buehlmann
introduce fncache repository layout...
r7229 try:
Matt Mackall
store: restore getsize method...
r17731 yield f, ef, self.getsize(ef)
Bryan O'Sullivan
store: only one kind of OSError means "nonexistent entry"
r17374 except OSError, err:
if err.errno != errno.ENOENT:
raise
Adrian Buehlmann
introduce fncache repository layout...
r7229
def copylist(self):
Pierre-Yves.David@ens-lyon.org
clone: copy obsolete markers during local clone...
r17249 d = ('data dh fncache phaseroots obsstore'
Pierre-Yves David
phases: prevent rebase to rebase immutable changeset.
r15742 ' 00manifest.d 00manifest.i 00changelog.d 00changelog.i')
Adrian Buehlmann
introduce fncache repository layout...
r7229 return (['requires', '00changelog.i'] +
Adrian Buehlmann
store: remove pointless pathjoiner parameter...
r13426 ['store/' + f for f in d.split()])
Adrian Buehlmann
introduce fncache repository layout...
r7229
Durham Goode
fncache: move fncache writing to be in a transaction...
r20883 def write(self, tr):
self.fncache.write(tr)
Adrian Buehlmann
fncachestore: defer updating the fncache file to a single file open...
r13391
Durham Goode
caches: invalidate store caches when lock is taken...
r20884 def invalidatecaches(self):
self.fncache.entries = None
Durham Goode
fncache: clean up fncache during strips...
r20885 def markremoved(self, fn):
self.fncache.remove(fn)
Adrian Buehlmann
store: add new _exists helper function on fncachestore
r17783 def _exists(self, f):
ef = self.encode(f)
try:
self.getsize(ef)
return True
except OSError, err:
if err.errno != errno.ENOENT:
raise
# nonexistent entry
return False
smuralid
store: add a contains method to fncachestore...
r17745 def __contains__(self, path):
'''Checks if the store contains path'''
path = "/".join(("data", path))
Adrian Buehlmann
store: move __contains__() implementation from class fncache into fncachestore...
r17782 # check for files (exact match)
Adrian Buehlmann
store: fncache may contain non-existent entries (fixes b9a56b816ff2)
r17784 e = path + '.i'
if e in self.fncache and self._exists(e):
Adrian Buehlmann
store: move __contains__() implementation from class fncache into fncachestore...
r17782 return True
# now check for directories (prefix match)
if not path.endswith('/'):
path += '/'
for e in self.fncache:
Adrian Buehlmann
store: fncache may contain non-existent entries (fixes b9a56b816ff2)
r17784 if e.startswith(path) and self._exists(e):
Adrian Buehlmann
store: move __contains__() implementation from class fncache into fncachestore...
r17782 return True
return False
smuralid
store: add a contains method to fncachestore...
r17745
FUJIWARA Katsunori
store: rename "openertype" argument to "vfstype"
r17651 def store(requirements, path, vfstype):
Matt Mackall
store: simplify class hierarchy
r6898 if 'store' in requirements:
Adrian Buehlmann
introduce fncache repository layout...
r7229 if 'fncache' in requirements:
FUJIWARA Katsunori
store: rename "openertype" argument to "vfstype"
r17651 return fncachestore(path, vfstype, 'dotencode' in requirements)
return encodedstore(path, vfstype)
return basicstore(path, vfstype)