Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/manifest.py @ 1487:2bc6cd62a29c
fix handling of files of unsupported type in the walk code
if a file was of unsupported type, it was considered as 'seen' while
walking. this way it was possible to have file in the dirstate not
yielded by the walk function.
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 02 Nov 2005 15:46:31 -0800 |
| parents | 54e4b187f69c |
| children | 80a3d6a0af71 |
| rev | line source |
|---|---|
| 1089 | 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 |
| 1089 | 8 import sys, struct |
| 262 | 9 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
|
10 from i18n import gettext as _ |
| 262 | 11 from demandload import * |
| 1089 | 12 demandload(globals(), "bisect") |
| 79 | 13 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
14 class manifest(revlog): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
15 def __init__(self, opener): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
16 self.mapcache = None |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
17 self.listcache = None |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
18 self.addlist = None |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
19 revlog.__init__(self, opener, "00manifest.i", "00manifest.d") |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
20 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
21 def read(self, node): |
| 313 | 22 if node == nullid: return {} # don't upset local cache |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
23 if self.mapcache and self.mapcache[0] == node: |
| 561 | 24 return self.mapcache[1] |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
25 text = self.revision(node) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
26 map = {} |
| 276 | 27 flag = {} |
|
25
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
28 self.listcache = (text, text.splitlines(1)) |
|
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
29 for l in self.listcache[1]: |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
30 (f, n) = l.split('\0') |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
31 map[f] = bin(n[:40]) |
| 276 | 32 flag[f] = (n[40:-1] == "x") |
| 33 self.mapcache = (node, map, flag) | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
34 return map |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
35 |
| 276 | 36 def readflags(self, node): |
| 313 | 37 if node == nullid: return {} # don't upset local cache |
|
358
9f4077d7ef6f
[PATCH] manifest.readflags performance buglet
mpm@selenic.com
parents:
350
diff
changeset
|
38 if not self.mapcache or self.mapcache[0] != node: |
| 276 | 39 self.read(node) |
| 40 return self.mapcache[2] | |
| 41 | |
| 741 | 42 def add(self, map, flags, transaction, link, p1=None, p2=None, |
| 43 changed=None): | |
| 644 | 44 # directly generate the mdiff delta from the data collected during |
| 45 # the bisect loop below | |
| 46 def gendelta(delta): | |
| 47 i = 0 | |
| 48 result = [] | |
| 49 while i < len(delta): | |
| 50 start = delta[i][2] | |
| 51 end = delta[i][3] | |
| 52 l = delta[i][4] | |
| 53 if l == None: | |
| 54 l = "" | |
| 741 | 55 while i < len(delta) - 1 and start <= delta[i+1][2] \ |
| 56 and end >= delta[i+1][2]: | |
| 644 | 57 if delta[i+1][3] > end: |
| 58 end = delta[i+1][3] | |
| 59 if delta[i+1][4]: | |
| 60 l += delta[i+1][4] | |
| 61 i += 1 | |
| 62 result.append(struct.pack(">lll", start, end, len(l)) + l) | |
| 63 i += 1 | |
| 64 return result | |
| 65 | |
| 66 # apply the changes collected during the bisect loop to our addlist | |
| 67 def addlistdelta(addlist, delta): | |
| 68 # apply the deltas to the addlist. start from the bottom up | |
| 69 # so changes to the offsets don't mess things up. | |
| 70 i = len(delta) | |
| 71 while i > 0: | |
| 72 i -= 1 | |
| 73 start = delta[i][0] | |
| 74 end = delta[i][1] | |
| 75 if delta[i][4]: | |
| 76 addlist[start:end] = [delta[i][4]] | |
| 77 else: | |
| 78 del addlist[start:end] | |
| 79 return addlist | |
| 80 | |
| 81 # calculate the byte offset of the start of each line in the | |
| 82 # manifest | |
| 83 def calcoffsets(addlist): | |
| 84 offsets = [0] * (len(addlist) + 1) | |
| 85 offset = 0 | |
| 86 i = 0 | |
| 87 while i < len(addlist): | |
| 88 offsets[i] = offset | |
| 89 offset += len(addlist[i]) | |
| 90 i += 1 | |
| 91 offsets[i] = offset | |
| 92 return offsets | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
93 |
| 644 | 94 # if we're using the listcache, make sure it is valid and |
| 95 # parented by the same node we're diffing against | |
| 741 | 96 if not changed or not self.listcache or not p1 or \ |
| 97 self.mapcache[0] != p1: | |
| 644 | 98 files = map.keys() |
| 99 files.sort() | |
| 100 | |
| 101 self.addlist = ["%s\000%s%s\n" % | |
| 102 (f, hex(map[f]), flags[f] and "x" or '') | |
| 103 for f in files] | |
| 104 cachedelta = None | |
| 105 else: | |
| 106 addlist = self.listcache[1] | |
| 107 | |
| 108 # find the starting offset for each line in the add list | |
| 109 offsets = calcoffsets(addlist) | |
| 110 | |
| 111 # combine the changed lists into one list for sorting | |
| 112 work = [[x, 0] for x in changed[0]] | |
| 113 work[len(work):] = [[x, 1] for x in changed[1]] | |
| 114 work.sort() | |
| 115 | |
| 116 delta = [] | |
| 117 bs = 0 | |
| 118 | |
| 119 for w in work: | |
| 120 f = w[0] | |
| 741 | 121 # bs will either be the index of the item or the insert point |
| 644 | 122 bs = bisect.bisect(addlist, f, bs) |
| 123 if bs < len(addlist): | |
| 124 fn = addlist[bs][:addlist[bs].index('\0')] | |
| 125 else: | |
| 126 fn = None | |
| 127 if w[1] == 0: | |
| 741 | 128 l = "%s\000%s%s\n" % (f, hex(map[f]), |
| 129 flags[f] and "x" or '') | |
| 644 | 130 else: |
| 131 l = None | |
| 132 start = bs | |
| 133 if fn != f: | |
| 134 # item not found, insert a new one | |
| 659 | 135 end = bs |
| 644 | 136 if w[1] == 1: |
| 1098 | 137 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
|
138 _("failed to remove %s from manifest\n") % f) |
| 644 | 139 else: |
| 140 # item is found, replace/delete the existing line | |
| 141 end = bs + 1 | |
| 142 delta.append([start, end, offsets[start], offsets[end], l]) | |
| 143 | |
| 144 self.addlist = addlistdelta(addlist, delta) | |
| 145 if self.mapcache[0] == self.tip(): | |
| 146 cachedelta = "".join(gendelta(delta)) | |
| 147 else: | |
| 148 cachedelta = None | |
| 149 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
150 text = "".join(self.addlist) |
| 644 | 151 if cachedelta and mdiff.patch(self.listcache[0], cachedelta) != text: |
|
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
|
152 raise AssertionError(_("manifest delta failure\n")) |
| 644 | 153 n = self.addrevision(text, transaction, link, p1, p2, cachedelta) |
| 302 | 154 self.mapcache = (n, map, flags) |
|
25
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
155 self.listcache = (text, self.addlist) |
| 140 | 156 self.addlist = None |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
157 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
158 return n |