manifest.py
234 lines
| 8.3 KiB
| text/x-python
|
PythonLexer
/ mercurial / manifest.py
mpm@selenic.com
|
r1089 | # manifest.py - manifest revision class for mercurial | ||
# | ||||
Thomas Arendsen Hein
|
r4635 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||
mpm@selenic.com
|
r1089 | # | ||
Martin Geisler
|
r8225 | # 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. | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r3891 | from i18n import _ | ||
Siddharth Agarwal
|
r18821 | import mdiff, parsers, error, revlog, util, dicthelpers | ||
Simon Heimberg
|
r8312 | import array, struct | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r2835 | class manifestdict(dict): | ||
Alexis S. L. Carvalho
|
r2857 | def __init__(self, mapping=None, flags=None): | ||
Matt Mackall
|
r10282 | if mapping is None: | ||
mapping = {} | ||||
if flags is None: | ||||
flags = {} | ||||
Matt Mackall
|
r2831 | dict.__init__(self, mapping) | ||
Matt Mackall
|
r2839 | self._flags = flags | ||
Matt Mackall
|
r2834 | def flags(self, f): | ||
Matt Mackall
|
r2839 | return self._flags.get(f, "") | ||
Jesse Glick
|
r16646 | def withflags(self): | ||
return set(self._flags.keys()) | ||||
Matt Mackall
|
r6743 | def set(self, f, flags): | ||
self._flags[f] = flags | ||||
Matt Mackall
|
r2831 | def copy(self): | ||
Benoit Boissinot
|
r9416 | return manifestdict(self, dict.copy(self._flags)) | ||
Siddharth Agarwal
|
r21879 | def intersectfiles(self, files): | ||
'''make a new manifestdict with the intersection of self with files | ||||
The algorithm assumes that files is much smaller than self.''' | ||||
ret = manifestdict() | ||||
for fn in files: | ||||
if fn in self: | ||||
ret[fn] = self[fn] | ||||
flags = self._flags.get(fn, None) | ||||
if flags: | ||||
ret._flags[fn] = flags | ||||
return ret | ||||
Siddharth Agarwal
|
r18821 | def flagsdiff(self, d2): | ||
return dicthelpers.diff(self._flags, d2._flags, "") | ||||
Matt Mackall
|
r2831 | |||
Augie Fackler
|
r22408 | |||
Augie Fackler
|
r22415 | def _checkforbidden(l): | ||
Augie Fackler
|
r22408 | """Check filenames for illegal characters.""" | ||
for f in l: | ||||
if '\n' in f or '\r' in f: | ||||
raise error.RevlogError( | ||||
_("'\\n' and '\\r' disallowed in filenames: %r") % f) | ||||
Augie Fackler
|
r22409 | # apply the changes collected during the bisect loop to our addlist | ||
# return a delta suitable for addrevision | ||||
Augie Fackler
|
r22415 | def _addlistdelta(addlist, x): | ||
Augie Fackler
|
r22409 | # for large addlist arrays, building a new array is cheaper | ||
# than repeatedly modifying the existing one | ||||
currentposition = 0 | ||||
newaddlist = array.array('c') | ||||
for start, end, content in x: | ||||
newaddlist += addlist[currentposition:start] | ||||
if content: | ||||
newaddlist += array.array('c', content) | ||||
currentposition = end | ||||
newaddlist += addlist[currentposition:] | ||||
deltatext = "".join(struct.pack(">lll", start, end, len(content)) | ||||
+ content for start, end, content in x) | ||||
return deltatext, newaddlist | ||||
Matt Mackall
|
r7634 | class manifest(revlog.revlog): | ||
Matt Mackall
|
r4258 | def __init__(self, opener): | ||
Durham Goode
|
r20075 | # we expect to deal with not more than four revs at a time, | ||
# during a commit --amend | ||||
self._mancache = util.lrucachedict(4) | ||||
Matt Mackall
|
r7634 | revlog.revlog.__init__(self, opener, "00manifest.i") | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r4995 | def parse(self, lines): | ||
mfdict = manifestdict() | ||||
Bryan O'Sullivan
|
r6389 | parsers.parse_manifest(mfdict, mfdict._flags, lines) | ||
Matt Mackall
|
r4995 | return mfdict | ||
Brendan Cully
|
r3196 | |||
def readdelta(self, node): | ||||
Matt Mackall
|
r7362 | r = self.rev(node) | ||
Benoit Boissinot
|
r12011 | return self.parse(mdiff.patchtext(self.revdiff(self.deltaparent(r), r))) | ||
Thomas Arendsen Hein
|
r3223 | |||
Matt Mackall
|
r13711 | def readfast(self, node): | ||
'''use the faster of readdelta or read''' | ||||
r = self.rev(node) | ||||
Sune Foldager
|
r14208 | deltaparent = self.deltaparent(r) | ||
if deltaparent != revlog.nullrev and deltaparent in self.parentrevs(r): | ||||
Matt Mackall
|
r13711 | return self.readdelta(node) | ||
return self.read(node) | ||||
mpm@selenic.com
|
r1089 | def read(self, node): | ||
Matt Mackall
|
r7634 | if node == revlog.nullid: | ||
return manifestdict() # don't upset local cache | ||||
Siddharth Agarwal
|
r18604 | if node in self._mancache: | ||
return self._mancache[node][0] | ||||
mpm@selenic.com
|
r1089 | text = self.revision(node) | ||
Benoit Boissinot
|
r9414 | arraytext = array.array('c', text) | ||
Matt Mackall
|
r4995 | mapping = self.parse(text) | ||
Siddharth Agarwal
|
r18604 | self._mancache[node] = (mapping, arraytext) | ||
Matt Mackall
|
r2835 | return mapping | ||
mpm@selenic.com
|
r1089 | |||
Vadim Gelfer
|
r2320 | def _search(self, m, s, lo=0, hi=None): | ||
'''return a tuple (start, end) that says where to find s within m. | ||||
If the string is found m[start:end] are the line containing | ||||
that string. If start == end the string was not found and | ||||
Mads Kiilerich
|
r17426 | they indicate the proper sorted insertion point. | ||
Vadim Gelfer
|
r2320 | |||
m should be a buffer or a string | ||||
s is a string''' | ||||
def advance(i, c): | ||||
while i < lenm and m[i] != c: | ||||
i += 1 | ||||
return i | ||||
Patrick Mezard
|
r7405 | if not s: | ||
return (lo, lo) | ||||
Vadim Gelfer
|
r2320 | lenm = len(m) | ||
if not hi: | ||||
hi = lenm | ||||
while lo < hi: | ||||
mid = (lo + hi) // 2 | ||||
start = mid | ||||
Matt Mackall
|
r10282 | while start > 0 and m[start - 1] != '\n': | ||
Vadim Gelfer
|
r2320 | start -= 1 | ||
end = advance(start, '\0') | ||||
if m[start:end] < s: | ||||
# we know that after the null there are 40 bytes of sha1 | ||||
# this translates to the bisect lo = mid + 1 | ||||
lo = advance(end + 40, '\n') + 1 | ||||
else: | ||||
# this translates to the bisect hi = mid | ||||
hi = start | ||||
end = advance(lo, '\0') | ||||
found = m[lo:end] | ||||
Renato Cunha
|
r11763 | if s == found: | ||
Vadim Gelfer
|
r2320 | # we know that after the null there are 40 bytes of sha1 | ||
end = advance(end + 40, '\n') | ||||
Matt Mackall
|
r10282 | return (lo, end + 1) | ||
Vadim Gelfer
|
r2320 | else: | ||
return (lo, lo) | ||||
def find(self, node, f): | ||||
'''look up entry for a single file efficiently. | ||||
Alexis S. L. Carvalho
|
r4159 | return (node, flags) pair if found, (None, None) if not.''' | ||
Siddharth Agarwal
|
r18604 | if node in self._mancache: | ||
mapping = self._mancache[node][0] | ||||
return mapping.get(f), mapping.flags(f) | ||||
Vadim Gelfer
|
r2320 | text = self.revision(node) | ||
start, end = self._search(text, f) | ||||
if start == end: | ||||
return None, None | ||||
l = text[start:end] | ||||
f, n = l.split('\0') | ||||
Matt Mackall
|
r7634 | return revlog.bin(n[:40]), n[40:-1] | ||
Vadim Gelfer
|
r2320 | |||
Matt Mackall
|
r2841 | def add(self, map, transaction, link, p1=None, p2=None, | ||
mpm@selenic.com
|
r1089 | changed=None): | ||
Benoit Boissinot
|
r9414 | # if we're using the cache, make sure it is valid and | ||
mpm@selenic.com
|
r1089 | # parented by the same node we're diffing against | ||
Siddharth Agarwal
|
r18604 | if not (changed and p1 and (p1 in self._mancache)): | ||
Matt Mackall
|
r8209 | files = sorted(map) | ||
Augie Fackler
|
r22415 | _checkforbidden(files) | ||
Benoit Boissinot
|
r3607 | |||
Matt Mackall
|
r1651 | # if this is changed to support newlines in filenames, | ||
# be sure to check the templates/ dir again (especially *-raw.tmpl) | ||||
Matt Mackall
|
r7634 | hex, flags = revlog.hex, map.flags | ||
Martin Geisler
|
r14632 | text = ''.join("%s\0%s%s\n" % (f, hex(map[f]), flags(f)) | ||
Benoit Boissinot
|
r9420 | for f in files) | ||
arraytext = array.array('c', text) | ||||
mpm@selenic.com
|
r1089 | cachedelta = None | ||
else: | ||||
Benoit Boissinot
|
r9415 | added, removed = changed | ||
Siddharth Agarwal
|
r18604 | addlist = self._mancache[p1][1] | ||
mpm@selenic.com
|
r1089 | |||
Augie Fackler
|
r22415 | _checkforbidden(added) | ||
mpm@selenic.com
|
r1089 | # combine the changed lists into one list for sorting | ||
Benoit Boissinot
|
r9415 | work = [(x, False) for x in added] | ||
work.extend((x, True) for x in removed) | ||||
Mads Kiilerich
|
r17428 | # this could use heapq.merge() (from Python 2.6+) or equivalent | ||
Benoit Boissinot
|
r9415 | # since the lists are already sorted | ||
mpm@selenic.com
|
r1089 | work.sort() | ||
delta = [] | ||||
mason@suse.com
|
r1534 | dstart = None | ||
dend = None | ||||
dline = [""] | ||||
start = 0 | ||||
# zero copy representation of addlist as a buffer | ||||
Matt Mackall
|
r15657 | addbuf = util.buffer(addlist) | ||
mpm@selenic.com
|
r1089 | |||
mason@suse.com
|
r1534 | # start with a readonly loop that finds the offset of | ||
# each line and creates the deltas | ||||
Benoit Boissinot
|
r9415 | for f, todelete in work: | ||
mpm@selenic.com
|
r1089 | # bs will either be the index of the item or the insert point | ||
Vadim Gelfer
|
r2320 | start, end = self._search(addbuf, f, start) | ||
Benoit Boissinot
|
r9415 | if not todelete: | ||
Martin Geisler
|
r14632 | l = "%s\0%s%s\n" % (f, revlog.hex(map[f]), map.flags(f)) | ||
mpm@selenic.com
|
r1089 | else: | ||
Benoit Boissinot
|
r9415 | if start == end: | ||
# item we want to delete was not found, error out | ||||
raise AssertionError( | ||||
_("failed to remove %s from manifest") % f) | ||||
mason@suse.com
|
r1534 | l = "" | ||
Martin Geisler
|
r13031 | if dstart is not None and dstart <= start and dend >= start: | ||
mason@suse.com
|
r1534 | if dend < end: | ||
dend = end | ||||
if l: | ||||
dline.append(l) | ||||
mpm@selenic.com
|
r1089 | else: | ||
Martin Geisler
|
r13031 | if dstart is not None: | ||
mason@suse.com
|
r1534 | delta.append([dstart, dend, "".join(dline)]) | ||
dstart = start | ||||
dend = end | ||||
dline = [l] | ||||
mpm@selenic.com
|
r1089 | |||
Martin Geisler
|
r13031 | if dstart is not None: | ||
mason@suse.com
|
r1534 | delta.append([dstart, dend, "".join(dline)]) | ||
# apply the delta to the addlist, and get a delta for addrevision | ||||
Augie Fackler
|
r22415 | deltatext, addlist = _addlistdelta(addlist, delta) | ||
Durham Goode
|
r17983 | cachedelta = (self.rev(p1), deltatext) | ||
Benoit Boissinot
|
r9414 | arraytext = addlist | ||
Matt Mackall
|
r15657 | text = util.buffer(arraytext) | ||
mason@suse.com
|
r1534 | |||
Benoit Boissinot
|
r9420 | n = self.addrevision(text, transaction, link, p1, p2, cachedelta) | ||
Siddharth Agarwal
|
r18604 | self._mancache[n] = (map, arraytext) | ||
mpm@selenic.com
|
r1089 | |||
return n | ||||