mercurial-scm/hg-stable: mercurial/manifest.py annotate

annotate mercurial/manifest.py @ 2835:a9f5d4149123

Combine manifest dict and flags dict into a single object This gets rid of the need to track two objects and might save memory. This might be faster implemented as a subclassed dict with auxiliary functions to access a sparse flags dict.

author	Matt Mackall <mpm@selenic.com>
date	Wed, 09 Aug 2006 14:53:03 -0500
parents	35af2e56f15a
children	b4f05ecf4ee8

rev	line source
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	1 # manifest.py - manifest revision class for mercurial
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	4 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	5 # This software may be used and distributed according to the terms
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	8 from revlog import *
1400 cf9a1233738a i18n first part: make '_' available for files who need it Benoit Boissinot <benoit.boissinot@ens-lyon.org parents: 1098 diff changeset	9 from i18n import gettext as _
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	10 from demandload import *
2470 fe1689273f84 use demandload more. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2320 diff changeset	11 demandload(globals(), "array bisect struct")
79 837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	12
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	13 class manifestdict(dict):
2831 0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	14 def __init__(self, mapping={}):
0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	15 dict.__init__(self, mapping)
2834 35af2e56f15a manifestflags: eliminate remaining users of direct dict access Matt Mackall <mpm@selenic.com> parents: 2833 diff changeset	16 def __getitem__(self, f):
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	17 return self.node(f)
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	18 def get(self, f, default=None):
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	19 try:
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	20 return dict.__getitem__(self, f)[:20]
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	21 except KeyError:
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	22 return default
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	23 def __setitem__(self, f, node):
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	24 fl = self.flags(f)
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	25 dict.__setitem__(self, f, node + fl)
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	26 def node(self, f):
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	27 return dict.__getitem__(self, f)[:20]
2834 35af2e56f15a manifestflags: eliminate remaining users of direct dict access Matt Mackall <mpm@selenic.com> parents: 2833 diff changeset	28 def flags(self, f):
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	29 return dict.get(self, f, "")[20:]
2831 0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	30 def execf(self, f):
0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	31 "test for executable in manifest flags"
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	32 return "x" in self.flags(f)
2831 0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	33 def linkf(self, f):
0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	34 "test for symlink in manifest flags"
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	35 return "l" in self.flags(f)
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	36 def rawset(self, f, node, flags):
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	37 dict.__setitem__(self, f, node + flags)
2831 0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	38 def set(self, f, execf=False, linkf=False):
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	39 n = dict.get(self, f, nullid)[:20]
2833 d0159c5f18bf Use strings for manifestflags to allow storing multiple flags Matt Mackall <mpm@selenic.com> parents: 2832 diff changeset	40 fl = ""
d0159c5f18bf Use strings for manifestflags to allow storing multiple flags Matt Mackall <mpm@selenic.com> parents: 2832 diff changeset	41 if execf: fl = "x"
d0159c5f18bf Use strings for manifestflags to allow storing multiple flags Matt Mackall <mpm@selenic.com> parents: 2832 diff changeset	42 if linkf: fl = "l"
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	43 dict.__setitem__(self, f, n + fl)
2831 0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	44 def copy(self):
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	45 return manifestdict(dict.copy(self))
2831 0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	46
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	47 class manifest(revlog):
2142 8a1e2a9c7013 Replaced 0 with REVLOGV0 where this meaning is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 2072 diff changeset	48 def __init__(self, opener, defversion=REVLOGV0):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	49 self.mapcache = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	50 self.listcache = None
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 1651 diff changeset	51 revlog.__init__(self, opener, "00manifest.i", "00manifest.d",
74d3f5336b66 Implement revlogng. mason@suse.com parents: 1651 diff changeset	52 defversion)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	53
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	54 def read(self, node):
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	55 if node == nullid: return manifestdict() # don't upset local cache
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	56 if self.mapcache and self.mapcache[0] == node:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	57 return self.mapcache[1]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	58 text = self.revision(node)
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	59 self.listcache = array.array('c', text)
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	60 lines = text.splitlines(1)
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	61 mapping = manifestdict()
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	62 for l in lines:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	63 (f, n) = l.split('\0')
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	64 mapping.rawset(f, bin(n[:40]), n[40:-1])
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	65 self.mapcache = (node, mapping)
a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	66 return mapping
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	67
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	68 def readflags(self, node):
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	69 return self.read(node)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	70
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	71 def diff(self, a, b):
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	72 return mdiff.textdiff(str(a), str(b))
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	73
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	74 def _search(self, m, s, lo=0, hi=None):
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	75 '''return a tuple (start, end) that says where to find s within m.
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	76
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	77 If the string is found m[start:end] are the line containing
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	78 that string. If start == end the string was not found and
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	79 they indicate the proper sorted insertion point. This was
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	80 taken from bisect_left, and modified to find line start/end as
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	81 it goes along.
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	82
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	83 m should be a buffer or a string
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	84 s is a string'''
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	85 def advance(i, c):
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	86 while i < lenm and m[i] != c:
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	87 i += 1
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	88 return i
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	89 lenm = len(m)
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	90 if not hi:
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	91 hi = lenm
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	92 while lo < hi:
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	93 mid = (lo + hi) // 2
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	94 start = mid
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	95 while start > 0 and m[start-1] != '\n':
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	96 start -= 1
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	97 end = advance(start, '\0')
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	98 if m[start:end] < s:
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	99 # we know that after the null there are 40 bytes of sha1
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	100 # this translates to the bisect lo = mid + 1
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	101 lo = advance(end + 40, '\n') + 1
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	102 else:
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	103 # this translates to the bisect hi = mid
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	104 hi = start
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	105 end = advance(lo, '\0')
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	106 found = m[lo:end]
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	107 if cmp(s, found) == 0:
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	108 # we know that after the null there are 40 bytes of sha1
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	109 end = advance(end + 40, '\n')
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	110 return (lo, end+1)
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	111 else:
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	112 return (lo, lo)
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	113
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	114 def find(self, node, f):
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	115 '''look up entry for a single file efficiently.
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	116 return (node, flag) pair if found, (None, None) if not.'''
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	117 if self.mapcache and node == self.mapcache[0]:
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	118 return self.mapcache[1].get(f), self.mapcache[1].flags(f)
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	119 text = self.revision(node)
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	120 start, end = self._search(text, f)
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	121 if start == end:
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	122 return None, None
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	123 l = text[start:end]
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	124 f, n = l.split('\0')
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	125 return bin(n[:40]), n[40:-1] == 'x'
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	126
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	127 def add(self, map, flags, transaction, link, p1=None, p2=None,
156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	128 changed=None):
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	129 # apply the changes collected during the bisect loop to our addlist
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	130 # return a delta suitable for addrevision
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	131 def addlistdelta(addlist, x):
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	132 # start from the bottom up
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	133 # so changes to the offsets don't mess things up.
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	134 i = len(x)
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	135 while i > 0:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	136 i -= 1
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	137 start = x[i][0]
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	138 end = x[i][1]
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	139 if x[i][2]:
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	140 addlist[start:end] = array.array('c', x[i][2])
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	141 else:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	142 del addlist[start:end]
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	143 return "".join([struct.pack(">lll", d[0], d[1], len(d[2])) + d[2] \
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	144 for d in x ])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	145
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	146 # if we're using the listcache, make sure it is valid and
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	147 # parented by the same node we're diffing against
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	148 if not changed or not self.listcache or not p1 or \
156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	149 self.mapcache[0] != p1:
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	150 files = map.keys()
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	151 files.sort()
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	152
1651 cf40d2a30fef Fix comment syntax Matt Mackall <mpm@selenic.com> parents: 1650 diff changeset	153 # if this is changed to support newlines in filenames,
cf40d2a30fef Fix comment syntax Matt Mackall <mpm@selenic.com> parents: 1650 diff changeset	154 # be sure to check the templates/ dir again (especially *-raw.tmpl)
2834 35af2e56f15a manifestflags: eliminate remaining users of direct dict access Matt Mackall <mpm@selenic.com> parents: 2833 diff changeset	155 text = ["%s\000%s%s\n" % (f, hex(map[f]), flags.flags(f)) for f in files]
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	156 self.listcache = array.array('c', "".join(text))
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	157 cachedelta = None
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	158 else:
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	159 addlist = self.listcache
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	160
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	161 # combine the changed lists into one list for sorting
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	162 work = [[x, 0] for x in changed[0]]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	163 work[len(work):] = [[x, 1] for x in changed[1]]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	164 work.sort()
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	165
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	166 delta = []
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	167 dstart = None
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	168 dend = None
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	169 dline = [""]
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	170 start = 0
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	171 # zero copy representation of addlist as a buffer
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	172 addbuf = buffer(addlist)
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	173
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	174 # start with a readonly loop that finds the offset of
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	175 # each line and creates the deltas
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	176 for w in work:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	177 f = w[0]
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	178 # bs will either be the index of the item or the insert point
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	179 start, end = self._search(addbuf, f, start)
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	180 if w[1] == 0:
2834 35af2e56f15a manifestflags: eliminate remaining users of direct dict access Matt Mackall <mpm@selenic.com> parents: 2833 diff changeset	181 l = "%s\000%s%s\n" % (f, hex(map[f]), flags.flags(f))
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	182 else:
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	183 l = ""
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	184 if start == end and w[1] == 1:
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	185 # item we want to delete was not found, error out
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	186 raise AssertionError(
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	187 _("failed to remove %s from manifest\n") % f)
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	188 if dstart != None and dstart <= start and dend >= start:
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	189 if dend < end:
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	190 dend = end
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	191 if l:
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	192 dline.append(l)
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	193 else:
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	194 if dstart != None:
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	195 delta.append([dstart, dend, "".join(dline)])
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	196 dstart = start
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	197 dend = end
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	198 dline = [l]
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	199
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	200 if dstart != None:
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	201 delta.append([dstart, dend, "".join(dline)])
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	202 # apply the delta to the addlist, and get a delta for addrevision
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	203 cachedelta = addlistdelta(addlist, delta)
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	204
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	205 # the delta is only valid if we've been processing the tip revision
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	206 if self.mapcache[0] != self.tip():
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	207 cachedelta = None
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	208 self.listcache = addlist
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	209
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	210 n = self.addrevision(buffer(self.listcache), transaction, link, p1, \
80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	211 p2, cachedelta)
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	212 self.mapcache = (n, map)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	213
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	214 return n

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/manifest.py @ 2835:a9f5d4149123