Show More
@@ -1,447 +1,455 b'' | |||||
1 | # changegroup.py - Mercurial changegroup manipulation functions |
|
1 | # changegroup.py - Mercurial changegroup manipulation functions | |
2 | # |
|
2 | # | |
3 | # Copyright 2006 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2006 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from i18n import _ |
|
8 | from i18n import _ | |
9 | from node import nullrev, hex |
|
9 | from node import nullrev, hex | |
10 | import mdiff, util, dagutil |
|
10 | import mdiff, util, dagutil | |
11 | import struct, os, bz2, zlib, tempfile |
|
11 | import struct, os, bz2, zlib, tempfile | |
12 |
|
12 | |||
13 | _BUNDLE10_DELTA_HEADER = "20s20s20s20s" |
|
13 | _BUNDLE10_DELTA_HEADER = "20s20s20s20s" | |
14 |
|
14 | |||
15 | def readexactly(stream, n): |
|
15 | def readexactly(stream, n): | |
16 | '''read n bytes from stream.read and abort if less was available''' |
|
16 | '''read n bytes from stream.read and abort if less was available''' | |
17 | s = stream.read(n) |
|
17 | s = stream.read(n) | |
18 | if len(s) < n: |
|
18 | if len(s) < n: | |
19 | raise util.Abort(_("stream ended unexpectedly" |
|
19 | raise util.Abort(_("stream ended unexpectedly" | |
20 | " (got %d bytes, expected %d)") |
|
20 | " (got %d bytes, expected %d)") | |
21 | % (len(s), n)) |
|
21 | % (len(s), n)) | |
22 | return s |
|
22 | return s | |
23 |
|
23 | |||
24 | def getchunk(stream): |
|
24 | def getchunk(stream): | |
25 | """return the next chunk from stream as a string""" |
|
25 | """return the next chunk from stream as a string""" | |
26 | d = readexactly(stream, 4) |
|
26 | d = readexactly(stream, 4) | |
27 | l = struct.unpack(">l", d)[0] |
|
27 | l = struct.unpack(">l", d)[0] | |
28 | if l <= 4: |
|
28 | if l <= 4: | |
29 | if l: |
|
29 | if l: | |
30 | raise util.Abort(_("invalid chunk length %d") % l) |
|
30 | raise util.Abort(_("invalid chunk length %d") % l) | |
31 | return "" |
|
31 | return "" | |
32 | return readexactly(stream, l - 4) |
|
32 | return readexactly(stream, l - 4) | |
33 |
|
33 | |||
34 | def chunkheader(length): |
|
34 | def chunkheader(length): | |
35 | """return a changegroup chunk header (string)""" |
|
35 | """return a changegroup chunk header (string)""" | |
36 | return struct.pack(">l", length + 4) |
|
36 | return struct.pack(">l", length + 4) | |
37 |
|
37 | |||
38 | def closechunk(): |
|
38 | def closechunk(): | |
39 | """return a changegroup chunk header (string) for a zero-length chunk""" |
|
39 | """return a changegroup chunk header (string) for a zero-length chunk""" | |
40 | return struct.pack(">l", 0) |
|
40 | return struct.pack(">l", 0) | |
41 |
|
41 | |||
42 | class nocompress(object): |
|
42 | class nocompress(object): | |
43 | def compress(self, x): |
|
43 | def compress(self, x): | |
44 | return x |
|
44 | return x | |
45 | def flush(self): |
|
45 | def flush(self): | |
46 | return "" |
|
46 | return "" | |
47 |
|
47 | |||
48 | bundletypes = { |
|
48 | bundletypes = { | |
49 | "": ("", nocompress), # only when using unbundle on ssh and old http servers |
|
49 | "": ("", nocompress), # only when using unbundle on ssh and old http servers | |
50 | # since the unification ssh accepts a header but there |
|
50 | # since the unification ssh accepts a header but there | |
51 | # is no capability signaling it. |
|
51 | # is no capability signaling it. | |
52 | "HG10UN": ("HG10UN", nocompress), |
|
52 | "HG10UN": ("HG10UN", nocompress), | |
53 | "HG10BZ": ("HG10", lambda: bz2.BZ2Compressor()), |
|
53 | "HG10BZ": ("HG10", lambda: bz2.BZ2Compressor()), | |
54 | "HG10GZ": ("HG10GZ", lambda: zlib.compressobj()), |
|
54 | "HG10GZ": ("HG10GZ", lambda: zlib.compressobj()), | |
55 | } |
|
55 | } | |
56 |
|
56 | |||
57 | # hgweb uses this list to communicate its preferred type |
|
57 | # hgweb uses this list to communicate its preferred type | |
58 | bundlepriority = ['HG10GZ', 'HG10BZ', 'HG10UN'] |
|
58 | bundlepriority = ['HG10GZ', 'HG10BZ', 'HG10UN'] | |
59 |
|
59 | |||
60 | def writebundle(cg, filename, bundletype): |
|
60 | def writebundle(cg, filename, bundletype): | |
61 | """Write a bundle file and return its filename. |
|
61 | """Write a bundle file and return its filename. | |
62 |
|
62 | |||
63 | Existing files will not be overwritten. |
|
63 | Existing files will not be overwritten. | |
64 | If no filename is specified, a temporary file is created. |
|
64 | If no filename is specified, a temporary file is created. | |
65 | bz2 compression can be turned off. |
|
65 | bz2 compression can be turned off. | |
66 | The bundle file will be deleted in case of errors. |
|
66 | The bundle file will be deleted in case of errors. | |
67 | """ |
|
67 | """ | |
68 |
|
68 | |||
69 | fh = None |
|
69 | fh = None | |
70 | cleanup = None |
|
70 | cleanup = None | |
71 | try: |
|
71 | try: | |
72 | if filename: |
|
72 | if filename: | |
73 | fh = open(filename, "wb") |
|
73 | fh = open(filename, "wb") | |
74 | else: |
|
74 | else: | |
75 | fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg") |
|
75 | fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg") | |
76 | fh = os.fdopen(fd, "wb") |
|
76 | fh = os.fdopen(fd, "wb") | |
77 | cleanup = filename |
|
77 | cleanup = filename | |
78 |
|
78 | |||
79 | header, compressor = bundletypes[bundletype] |
|
79 | header, compressor = bundletypes[bundletype] | |
80 | fh.write(header) |
|
80 | fh.write(header) | |
81 | z = compressor() |
|
81 | z = compressor() | |
82 |
|
82 | |||
83 | # parse the changegroup data, otherwise we will block |
|
83 | # parse the changegroup data, otherwise we will block | |
84 | # in case of sshrepo because we don't know the end of the stream |
|
84 | # in case of sshrepo because we don't know the end of the stream | |
85 |
|
85 | |||
86 | # an empty chunkgroup is the end of the changegroup |
|
86 | # an empty chunkgroup is the end of the changegroup | |
87 | # a changegroup has at least 2 chunkgroups (changelog and manifest). |
|
87 | # a changegroup has at least 2 chunkgroups (changelog and manifest). | |
88 | # after that, an empty chunkgroup is the end of the changegroup |
|
88 | # after that, an empty chunkgroup is the end of the changegroup | |
89 | empty = False |
|
89 | empty = False | |
90 | count = 0 |
|
90 | count = 0 | |
91 | while not empty or count <= 2: |
|
91 | while not empty or count <= 2: | |
92 | empty = True |
|
92 | empty = True | |
93 | count += 1 |
|
93 | count += 1 | |
94 | while True: |
|
94 | while True: | |
95 | chunk = getchunk(cg) |
|
95 | chunk = getchunk(cg) | |
96 | if not chunk: |
|
96 | if not chunk: | |
97 | break |
|
97 | break | |
98 | empty = False |
|
98 | empty = False | |
99 | fh.write(z.compress(chunkheader(len(chunk)))) |
|
99 | fh.write(z.compress(chunkheader(len(chunk)))) | |
100 | pos = 0 |
|
100 | pos = 0 | |
101 | while pos < len(chunk): |
|
101 | while pos < len(chunk): | |
102 | next = pos + 2**20 |
|
102 | next = pos + 2**20 | |
103 | fh.write(z.compress(chunk[pos:next])) |
|
103 | fh.write(z.compress(chunk[pos:next])) | |
104 | pos = next |
|
104 | pos = next | |
105 | fh.write(z.compress(closechunk())) |
|
105 | fh.write(z.compress(closechunk())) | |
106 | fh.write(z.flush()) |
|
106 | fh.write(z.flush()) | |
107 | cleanup = None |
|
107 | cleanup = None | |
108 | return filename |
|
108 | return filename | |
109 | finally: |
|
109 | finally: | |
110 | if fh is not None: |
|
110 | if fh is not None: | |
111 | fh.close() |
|
111 | fh.close() | |
112 | if cleanup is not None: |
|
112 | if cleanup is not None: | |
113 | os.unlink(cleanup) |
|
113 | os.unlink(cleanup) | |
114 |
|
114 | |||
115 | def decompressor(fh, alg): |
|
115 | def decompressor(fh, alg): | |
116 | if alg == 'UN': |
|
116 | if alg == 'UN': | |
117 | return fh |
|
117 | return fh | |
118 | elif alg == 'GZ': |
|
118 | elif alg == 'GZ': | |
119 | def generator(f): |
|
119 | def generator(f): | |
120 | zd = zlib.decompressobj() |
|
120 | zd = zlib.decompressobj() | |
121 | for chunk in util.filechunkiter(f): |
|
121 | for chunk in util.filechunkiter(f): | |
122 | yield zd.decompress(chunk) |
|
122 | yield zd.decompress(chunk) | |
123 | elif alg == 'BZ': |
|
123 | elif alg == 'BZ': | |
124 | def generator(f): |
|
124 | def generator(f): | |
125 | zd = bz2.BZ2Decompressor() |
|
125 | zd = bz2.BZ2Decompressor() | |
126 | zd.decompress("BZ") |
|
126 | zd.decompress("BZ") | |
127 | for chunk in util.filechunkiter(f, 4096): |
|
127 | for chunk in util.filechunkiter(f, 4096): | |
128 | yield zd.decompress(chunk) |
|
128 | yield zd.decompress(chunk) | |
129 | else: |
|
129 | else: | |
130 | raise util.Abort("unknown bundle compression '%s'" % alg) |
|
130 | raise util.Abort("unknown bundle compression '%s'" % alg) | |
131 | return util.chunkbuffer(generator(fh)) |
|
131 | return util.chunkbuffer(generator(fh)) | |
132 |
|
132 | |||
133 | class unbundle10(object): |
|
133 | class unbundle10(object): | |
134 | deltaheader = _BUNDLE10_DELTA_HEADER |
|
134 | deltaheader = _BUNDLE10_DELTA_HEADER | |
135 | deltaheadersize = struct.calcsize(deltaheader) |
|
135 | deltaheadersize = struct.calcsize(deltaheader) | |
136 | def __init__(self, fh, alg): |
|
136 | def __init__(self, fh, alg): | |
137 | self._stream = decompressor(fh, alg) |
|
137 | self._stream = decompressor(fh, alg) | |
138 | self._type = alg |
|
138 | self._type = alg | |
139 | self.callback = None |
|
139 | self.callback = None | |
140 | def compressed(self): |
|
140 | def compressed(self): | |
141 | return self._type != 'UN' |
|
141 | return self._type != 'UN' | |
142 | def read(self, l): |
|
142 | def read(self, l): | |
143 | return self._stream.read(l) |
|
143 | return self._stream.read(l) | |
144 | def seek(self, pos): |
|
144 | def seek(self, pos): | |
145 | return self._stream.seek(pos) |
|
145 | return self._stream.seek(pos) | |
146 | def tell(self): |
|
146 | def tell(self): | |
147 | return self._stream.tell() |
|
147 | return self._stream.tell() | |
148 | def close(self): |
|
148 | def close(self): | |
149 | return self._stream.close() |
|
149 | return self._stream.close() | |
150 |
|
150 | |||
151 | def chunklength(self): |
|
151 | def chunklength(self): | |
152 | d = readexactly(self._stream, 4) |
|
152 | d = readexactly(self._stream, 4) | |
153 | l = struct.unpack(">l", d)[0] |
|
153 | l = struct.unpack(">l", d)[0] | |
154 | if l <= 4: |
|
154 | if l <= 4: | |
155 | if l: |
|
155 | if l: | |
156 | raise util.Abort(_("invalid chunk length %d") % l) |
|
156 | raise util.Abort(_("invalid chunk length %d") % l) | |
157 | return 0 |
|
157 | return 0 | |
158 | if self.callback: |
|
158 | if self.callback: | |
159 | self.callback() |
|
159 | self.callback() | |
160 | return l - 4 |
|
160 | return l - 4 | |
161 |
|
161 | |||
162 | def changelogheader(self): |
|
162 | def changelogheader(self): | |
163 | """v10 does not have a changelog header chunk""" |
|
163 | """v10 does not have a changelog header chunk""" | |
164 | return {} |
|
164 | return {} | |
165 |
|
165 | |||
166 | def manifestheader(self): |
|
166 | def manifestheader(self): | |
167 | """v10 does not have a manifest header chunk""" |
|
167 | """v10 does not have a manifest header chunk""" | |
168 | return {} |
|
168 | return {} | |
169 |
|
169 | |||
170 | def filelogheader(self): |
|
170 | def filelogheader(self): | |
171 | """return the header of the filelogs chunk, v10 only has the filename""" |
|
171 | """return the header of the filelogs chunk, v10 only has the filename""" | |
172 | l = self.chunklength() |
|
172 | l = self.chunklength() | |
173 | if not l: |
|
173 | if not l: | |
174 | return {} |
|
174 | return {} | |
175 | fname = readexactly(self._stream, l) |
|
175 | fname = readexactly(self._stream, l) | |
176 | return {'filename': fname} |
|
176 | return {'filename': fname} | |
177 |
|
177 | |||
178 | def _deltaheader(self, headertuple, prevnode): |
|
178 | def _deltaheader(self, headertuple, prevnode): | |
179 | node, p1, p2, cs = headertuple |
|
179 | node, p1, p2, cs = headertuple | |
180 | if prevnode is None: |
|
180 | if prevnode is None: | |
181 | deltabase = p1 |
|
181 | deltabase = p1 | |
182 | else: |
|
182 | else: | |
183 | deltabase = prevnode |
|
183 | deltabase = prevnode | |
184 | return node, p1, p2, deltabase, cs |
|
184 | return node, p1, p2, deltabase, cs | |
185 |
|
185 | |||
186 | def deltachunk(self, prevnode): |
|
186 | def deltachunk(self, prevnode): | |
187 | l = self.chunklength() |
|
187 | l = self.chunklength() | |
188 | if not l: |
|
188 | if not l: | |
189 | return {} |
|
189 | return {} | |
190 | headerdata = readexactly(self._stream, self.deltaheadersize) |
|
190 | headerdata = readexactly(self._stream, self.deltaheadersize) | |
191 | header = struct.unpack(self.deltaheader, headerdata) |
|
191 | header = struct.unpack(self.deltaheader, headerdata) | |
192 | delta = readexactly(self._stream, l - self.deltaheadersize) |
|
192 | delta = readexactly(self._stream, l - self.deltaheadersize) | |
193 | node, p1, p2, deltabase, cs = self._deltaheader(header, prevnode) |
|
193 | node, p1, p2, deltabase, cs = self._deltaheader(header, prevnode) | |
194 | return {'node': node, 'p1': p1, 'p2': p2, 'cs': cs, |
|
194 | return {'node': node, 'p1': p1, 'p2': p2, 'cs': cs, | |
195 | 'deltabase': deltabase, 'delta': delta} |
|
195 | 'deltabase': deltabase, 'delta': delta} | |
196 |
|
196 | |||
197 | class headerlessfixup(object): |
|
197 | class headerlessfixup(object): | |
198 | def __init__(self, fh, h): |
|
198 | def __init__(self, fh, h): | |
199 | self._h = h |
|
199 | self._h = h | |
200 | self._fh = fh |
|
200 | self._fh = fh | |
201 | def read(self, n): |
|
201 | def read(self, n): | |
202 | if self._h: |
|
202 | if self._h: | |
203 | d, self._h = self._h[:n], self._h[n:] |
|
203 | d, self._h = self._h[:n], self._h[n:] | |
204 | if len(d) < n: |
|
204 | if len(d) < n: | |
205 | d += readexactly(self._fh, n - len(d)) |
|
205 | d += readexactly(self._fh, n - len(d)) | |
206 | return d |
|
206 | return d | |
207 | return readexactly(self._fh, n) |
|
207 | return readexactly(self._fh, n) | |
208 |
|
208 | |||
209 | def readbundle(fh, fname): |
|
209 | def readbundle(fh, fname): | |
210 | header = readexactly(fh, 6) |
|
210 | header = readexactly(fh, 6) | |
211 |
|
211 | |||
212 | if not fname: |
|
212 | if not fname: | |
213 | fname = "stream" |
|
213 | fname = "stream" | |
214 | if not header.startswith('HG') and header.startswith('\0'): |
|
214 | if not header.startswith('HG') and header.startswith('\0'): | |
215 | fh = headerlessfixup(fh, header) |
|
215 | fh = headerlessfixup(fh, header) | |
216 | header = "HG10UN" |
|
216 | header = "HG10UN" | |
217 |
|
217 | |||
218 | magic, version, alg = header[0:2], header[2:4], header[4:6] |
|
218 | magic, version, alg = header[0:2], header[2:4], header[4:6] | |
219 |
|
219 | |||
220 | if magic != 'HG': |
|
220 | if magic != 'HG': | |
221 | raise util.Abort(_('%s: not a Mercurial bundle') % fname) |
|
221 | raise util.Abort(_('%s: not a Mercurial bundle') % fname) | |
222 | if version != '10': |
|
222 | if version != '10': | |
223 | raise util.Abort(_('%s: unknown bundle version %s') % (fname, version)) |
|
223 | raise util.Abort(_('%s: unknown bundle version %s') % (fname, version)) | |
224 | return unbundle10(fh, alg) |
|
224 | return unbundle10(fh, alg) | |
225 |
|
225 | |||
226 | class bundle10(object): |
|
226 | class bundle10(object): | |
227 | deltaheader = _BUNDLE10_DELTA_HEADER |
|
227 | deltaheader = _BUNDLE10_DELTA_HEADER | |
228 | def __init__(self, repo, bundlecaps=None): |
|
228 | def __init__(self, repo, bundlecaps=None): | |
229 | """Given a source repo, construct a bundler. |
|
229 | """Given a source repo, construct a bundler. | |
230 |
|
230 | |||
231 | bundlecaps is optional and can be used to specify the set of |
|
231 | bundlecaps is optional and can be used to specify the set of | |
232 | capabilities which can be used to build the bundle. |
|
232 | capabilities which can be used to build the bundle. | |
233 | """ |
|
233 | """ | |
234 | # Set of capabilities we can use to build the bundle. |
|
234 | # Set of capabilities we can use to build the bundle. | |
235 | if bundlecaps is None: |
|
235 | if bundlecaps is None: | |
236 | bundlecaps = set() |
|
236 | bundlecaps = set() | |
237 | self._bundlecaps = bundlecaps |
|
237 | self._bundlecaps = bundlecaps | |
238 | self._changelog = repo.changelog |
|
238 | self._changelog = repo.changelog | |
239 | self._manifest = repo.manifest |
|
239 | self._manifest = repo.manifest | |
240 | reorder = repo.ui.config('bundle', 'reorder', 'auto') |
|
240 | reorder = repo.ui.config('bundle', 'reorder', 'auto') | |
241 | if reorder == 'auto': |
|
241 | if reorder == 'auto': | |
242 | reorder = None |
|
242 | reorder = None | |
243 | else: |
|
243 | else: | |
244 | reorder = util.parsebool(reorder) |
|
244 | reorder = util.parsebool(reorder) | |
245 | self._repo = repo |
|
245 | self._repo = repo | |
246 | self._reorder = reorder |
|
246 | self._reorder = reorder | |
247 | self._progress = repo.ui.progress |
|
247 | self._progress = repo.ui.progress | |
248 | def close(self): |
|
248 | def close(self): | |
249 | return closechunk() |
|
249 | return closechunk() | |
250 |
|
250 | |||
251 | def fileheader(self, fname): |
|
251 | def fileheader(self, fname): | |
252 | return chunkheader(len(fname)) + fname |
|
252 | return chunkheader(len(fname)) + fname | |
253 |
|
253 | |||
254 | def group(self, nodelist, revlog, lookup, units=None, reorder=None): |
|
254 | def group(self, nodelist, revlog, lookup, units=None, reorder=None): | |
255 | """Calculate a delta group, yielding a sequence of changegroup chunks |
|
255 | """Calculate a delta group, yielding a sequence of changegroup chunks | |
256 | (strings). |
|
256 | (strings). | |
257 |
|
257 | |||
258 | Given a list of changeset revs, return a set of deltas and |
|
258 | Given a list of changeset revs, return a set of deltas and | |
259 | metadata corresponding to nodes. The first delta is |
|
259 | metadata corresponding to nodes. The first delta is | |
260 | first parent(nodelist[0]) -> nodelist[0], the receiver is |
|
260 | first parent(nodelist[0]) -> nodelist[0], the receiver is | |
261 | guaranteed to have this parent as it has all history before |
|
261 | guaranteed to have this parent as it has all history before | |
262 | these changesets. In the case firstparent is nullrev the |
|
262 | these changesets. In the case firstparent is nullrev the | |
263 | changegroup starts with a full revision. |
|
263 | changegroup starts with a full revision. | |
264 |
|
264 | |||
265 | If units is not None, progress detail will be generated, units specifies |
|
265 | If units is not None, progress detail will be generated, units specifies | |
266 | the type of revlog that is touched (changelog, manifest, etc.). |
|
266 | the type of revlog that is touched (changelog, manifest, etc.). | |
267 | """ |
|
267 | """ | |
268 | # if we don't have any revisions touched by these changesets, bail |
|
268 | # if we don't have any revisions touched by these changesets, bail | |
269 | if len(nodelist) == 0: |
|
269 | if len(nodelist) == 0: | |
270 | yield self.close() |
|
270 | yield self.close() | |
271 | return |
|
271 | return | |
272 |
|
272 | |||
273 | # for generaldelta revlogs, we linearize the revs; this will both be |
|
273 | # for generaldelta revlogs, we linearize the revs; this will both be | |
274 | # much quicker and generate a much smaller bundle |
|
274 | # much quicker and generate a much smaller bundle | |
275 | if (revlog._generaldelta and reorder is not False) or reorder: |
|
275 | if (revlog._generaldelta and reorder is not False) or reorder: | |
276 | dag = dagutil.revlogdag(revlog) |
|
276 | dag = dagutil.revlogdag(revlog) | |
277 | revs = set(revlog.rev(n) for n in nodelist) |
|
277 | revs = set(revlog.rev(n) for n in nodelist) | |
278 | revs = dag.linearize(revs) |
|
278 | revs = dag.linearize(revs) | |
279 | else: |
|
279 | else: | |
280 | revs = sorted([revlog.rev(n) for n in nodelist]) |
|
280 | revs = sorted([revlog.rev(n) for n in nodelist]) | |
281 |
|
281 | |||
282 | # add the parent of the first rev |
|
282 | # add the parent of the first rev | |
283 | p = revlog.parentrevs(revs[0])[0] |
|
283 | p = revlog.parentrevs(revs[0])[0] | |
284 | revs.insert(0, p) |
|
284 | revs.insert(0, p) | |
285 |
|
285 | |||
286 | # build deltas |
|
286 | # build deltas | |
287 | total = len(revs) - 1 |
|
287 | total = len(revs) - 1 | |
288 | msgbundling = _('bundling') |
|
288 | msgbundling = _('bundling') | |
289 | for r in xrange(len(revs) - 1): |
|
289 | for r in xrange(len(revs) - 1): | |
290 | if units is not None: |
|
290 | if units is not None: | |
291 | self._progress(msgbundling, r + 1, unit=units, total=total) |
|
291 | self._progress(msgbundling, r + 1, unit=units, total=total) | |
292 | prev, curr = revs[r], revs[r + 1] |
|
292 | prev, curr = revs[r], revs[r + 1] | |
293 | linknode = lookup(revlog.node(curr)) |
|
293 | linknode = lookup(revlog.node(curr)) | |
294 | for c in self.revchunk(revlog, curr, prev, linknode): |
|
294 | for c in self.revchunk(revlog, curr, prev, linknode): | |
295 | yield c |
|
295 | yield c | |
296 |
|
296 | |||
297 | yield self.close() |
|
297 | yield self.close() | |
298 |
|
298 | |||
299 | # filter any nodes that claim to be part of the known set |
|
299 | # filter any nodes that claim to be part of the known set | |
300 | def prune(self, revlog, missing, commonrevs, source): |
|
300 | def prune(self, revlog, missing, commonrevs, source): | |
301 | rr, rl = revlog.rev, revlog.linkrev |
|
301 | rr, rl = revlog.rev, revlog.linkrev | |
302 | return [n for n in missing if rl(rr(n)) not in commonrevs] |
|
302 | return [n for n in missing if rl(rr(n)) not in commonrevs] | |
303 |
|
303 | |||
304 | def generate(self, commonrevs, clnodes, fastpathlinkrev, source): |
|
304 | def generate(self, commonrevs, clnodes, fastpathlinkrev, source): | |
305 | '''yield a sequence of changegroup chunks (strings)''' |
|
305 | '''yield a sequence of changegroup chunks (strings)''' | |
306 | repo = self._repo |
|
306 | repo = self._repo | |
307 | cl = self._changelog |
|
307 | cl = self._changelog | |
308 | mf = self._manifest |
|
308 | mf = self._manifest | |
309 | reorder = self._reorder |
|
309 | reorder = self._reorder | |
310 | progress = self._progress |
|
310 | progress = self._progress | |
311 |
|
311 | |||
312 | # for progress output |
|
312 | # for progress output | |
313 | msgbundling = _('bundling') |
|
313 | msgbundling = _('bundling') | |
314 |
|
314 | |||
315 | mfs = {} # needed manifests |
|
315 | mfs = {} # needed manifests | |
316 | fnodes = {} # needed file nodes |
|
316 | fnodes = {} # needed file nodes | |
317 | changedfiles = set() |
|
317 | changedfiles = set() | |
318 |
|
318 | |||
319 | # Callback for the changelog, used to collect changed files and manifest |
|
319 | # Callback for the changelog, used to collect changed files and manifest | |
320 | # nodes. |
|
320 | # nodes. | |
321 | # Returns the linkrev node (identity in the changelog case). |
|
321 | # Returns the linkrev node (identity in the changelog case). | |
322 | def lookupcl(x): |
|
322 | def lookupcl(x): | |
323 | c = cl.read(x) |
|
323 | c = cl.read(x) | |
324 | changedfiles.update(c[3]) |
|
324 | changedfiles.update(c[3]) | |
325 | # record the first changeset introducing this manifest version |
|
325 | # record the first changeset introducing this manifest version | |
326 | mfs.setdefault(c[0], x) |
|
326 | mfs.setdefault(c[0], x) | |
327 | return x |
|
327 | return x | |
328 |
|
328 | |||
329 | # Callback for the manifest, used to collect linkrevs for filelog |
|
329 | # Callback for the manifest, used to collect linkrevs for filelog | |
330 | # revisions. |
|
330 | # revisions. | |
331 | # Returns the linkrev node (collected in lookupcl). |
|
331 | # Returns the linkrev node (collected in lookupcl). | |
332 | def lookupmf(x): |
|
332 | def lookupmf(x): | |
333 | clnode = mfs[x] |
|
333 | clnode = mfs[x] | |
334 | if not fastpathlinkrev: |
|
334 | if not fastpathlinkrev: | |
335 | mdata = mf.readfast(x) |
|
335 | mdata = mf.readfast(x) | |
336 | for f, n in mdata.iteritems(): |
|
336 | for f, n in mdata.iteritems(): | |
337 | if f in changedfiles: |
|
337 | if f in changedfiles: | |
338 | # record the first changeset introducing this filelog |
|
338 | # record the first changeset introducing this filelog | |
339 | # version |
|
339 | # version | |
340 | fnodes[f].setdefault(n, clnode) |
|
340 | fnodes[f].setdefault(n, clnode) | |
341 | return clnode |
|
341 | return clnode | |
342 |
|
342 | |||
343 | for chunk in self.group(clnodes, cl, lookupcl, units=_('changesets'), |
|
343 | for chunk in self.group(clnodes, cl, lookupcl, units=_('changesets'), | |
344 | reorder=reorder): |
|
344 | reorder=reorder): | |
345 | yield chunk |
|
345 | yield chunk | |
346 | progress(msgbundling, None) |
|
346 | progress(msgbundling, None) | |
347 |
|
347 | |||
348 | for f in changedfiles: |
|
348 | for f in changedfiles: | |
349 | fnodes[f] = {} |
|
349 | fnodes[f] = {} | |
350 | mfnodes = self.prune(mf, mfs, commonrevs, source) |
|
350 | mfnodes = self.prune(mf, mfs, commonrevs, source) | |
351 | for chunk in self.group(mfnodes, mf, lookupmf, units=_('manifests'), |
|
351 | for chunk in self.group(mfnodes, mf, lookupmf, units=_('manifests'), | |
352 | reorder=reorder): |
|
352 | reorder=reorder): | |
353 | yield chunk |
|
353 | yield chunk | |
354 | progress(msgbundling, None) |
|
354 | progress(msgbundling, None) | |
355 |
|
355 | |||
356 | mfs.clear() |
|
356 | mfs.clear() | |
357 | needed = set(cl.rev(x) for x in clnodes) |
|
357 | needed = set(cl.rev(x) for x in clnodes) | |
358 |
|
358 | |||
359 | def linknodes(filerevlog, fname): |
|
359 | def linknodes(filerevlog, fname): | |
360 | if fastpathlinkrev: |
|
360 | if fastpathlinkrev: | |
361 | ln, llr = filerevlog.node, filerevlog.linkrev |
|
361 | ln, llr = filerevlog.node, filerevlog.linkrev | |
362 | def genfilenodes(): |
|
362 | def genfilenodes(): | |
363 | for r in filerevlog: |
|
363 | for r in filerevlog: | |
364 | linkrev = llr(r) |
|
364 | linkrev = llr(r) | |
365 | if linkrev in needed: |
|
365 | if linkrev in needed: | |
366 | yield filerevlog.node(r), cl.node(linkrev) |
|
366 | yield filerevlog.node(r), cl.node(linkrev) | |
367 | fnodes[fname] = dict(genfilenodes()) |
|
367 | fnodes[fname] = dict(genfilenodes()) | |
368 | return fnodes.get(fname, {}) |
|
368 | return fnodes.get(fname, {}) | |
369 |
|
369 | |||
370 | for chunk in self.generatefiles(changedfiles, linknodes, commonrevs, |
|
370 | for chunk in self.generatefiles(changedfiles, linknodes, commonrevs, | |
371 | source): |
|
371 | source): | |
372 | yield chunk |
|
372 | yield chunk | |
373 |
|
373 | |||
374 | yield self.close() |
|
374 | yield self.close() | |
375 | progress(msgbundling, None) |
|
375 | progress(msgbundling, None) | |
376 |
|
376 | |||
377 | if clnodes: |
|
377 | if clnodes: | |
378 | repo.hook('outgoing', node=hex(clnodes[0]), source=source) |
|
378 | repo.hook('outgoing', node=hex(clnodes[0]), source=source) | |
379 |
|
379 | |||
380 | def generatefiles(self, changedfiles, linknodes, commonrevs, source): |
|
380 | def generatefiles(self, changedfiles, linknodes, commonrevs, source): | |
381 | repo = self._repo |
|
381 | repo = self._repo | |
382 | progress = self._progress |
|
382 | progress = self._progress | |
383 | reorder = self._reorder |
|
383 | reorder = self._reorder | |
384 | msgbundling = _('bundling') |
|
384 | msgbundling = _('bundling') | |
385 |
|
385 | |||
386 | total = len(changedfiles) |
|
386 | total = len(changedfiles) | |
387 | # for progress output |
|
387 | # for progress output | |
388 | msgfiles = _('files') |
|
388 | msgfiles = _('files') | |
389 | for i, fname in enumerate(sorted(changedfiles)): |
|
389 | for i, fname in enumerate(sorted(changedfiles)): | |
390 | filerevlog = repo.file(fname) |
|
390 | filerevlog = repo.file(fname) | |
391 | if not filerevlog: |
|
391 | if not filerevlog: | |
392 | raise util.Abort(_("empty or missing revlog for %s") % fname) |
|
392 | raise util.Abort(_("empty or missing revlog for %s") % fname) | |
393 |
|
393 | |||
394 | linkrevnodes = linknodes(filerevlog, fname) |
|
394 | linkrevnodes = linknodes(filerevlog, fname) | |
395 | # Lookup for filenodes, we collected the linkrev nodes above in the |
|
395 | # Lookup for filenodes, we collected the linkrev nodes above in the | |
396 | # fastpath case and with lookupmf in the slowpath case. |
|
396 | # fastpath case and with lookupmf in the slowpath case. | |
397 | def lookupfilelog(x): |
|
397 | def lookupfilelog(x): | |
398 | return linkrevnodes[x] |
|
398 | return linkrevnodes[x] | |
399 |
|
399 | |||
400 | filenodes = self.prune(filerevlog, linkrevnodes, commonrevs, source) |
|
400 | filenodes = self.prune(filerevlog, linkrevnodes, commonrevs, source) | |
401 | if filenodes: |
|
401 | if filenodes: | |
402 | progress(msgbundling, i + 1, item=fname, unit=msgfiles, |
|
402 | progress(msgbundling, i + 1, item=fname, unit=msgfiles, | |
403 | total=total) |
|
403 | total=total) | |
404 | yield self.fileheader(fname) |
|
404 | yield self.fileheader(fname) | |
405 | for chunk in self.group(filenodes, filerevlog, lookupfilelog, |
|
405 | for chunk in self.group(filenodes, filerevlog, lookupfilelog, | |
406 | reorder=reorder): |
|
406 | reorder=reorder): | |
407 | yield chunk |
|
407 | yield chunk | |
408 |
|
408 | |||
409 | def revchunk(self, revlog, rev, prev, linknode): |
|
409 | def revchunk(self, revlog, rev, prev, linknode): | |
410 | node = revlog.node(rev) |
|
410 | node = revlog.node(rev) | |
411 | p1, p2 = revlog.parentrevs(rev) |
|
411 | p1, p2 = revlog.parentrevs(rev) | |
412 | base = prev |
|
412 | base = prev | |
413 |
|
413 | |||
414 | prefix = '' |
|
414 | prefix = '' | |
415 | if base == nullrev: |
|
415 | if base == nullrev: | |
416 | delta = revlog.revision(node) |
|
416 | delta = revlog.revision(node) | |
417 | prefix = mdiff.trivialdiffheader(len(delta)) |
|
417 | prefix = mdiff.trivialdiffheader(len(delta)) | |
418 | else: |
|
418 | else: | |
419 | delta = revlog.revdiff(base, rev) |
|
419 | delta = revlog.revdiff(base, rev) | |
420 | p1n, p2n = revlog.parents(node) |
|
420 | p1n, p2n = revlog.parents(node) | |
421 | basenode = revlog.node(base) |
|
421 | basenode = revlog.node(base) | |
422 | meta = self.builddeltaheader(node, p1n, p2n, basenode, linknode) |
|
422 | meta = self.builddeltaheader(node, p1n, p2n, basenode, linknode) | |
423 | meta += prefix |
|
423 | meta += prefix | |
424 | l = len(meta) + len(delta) |
|
424 | l = len(meta) + len(delta) | |
425 | yield chunkheader(l) |
|
425 | yield chunkheader(l) | |
426 | yield meta |
|
426 | yield meta | |
427 | yield delta |
|
427 | yield delta | |
428 | def builddeltaheader(self, node, p1n, p2n, basenode, linknode): |
|
428 | def builddeltaheader(self, node, p1n, p2n, basenode, linknode): | |
429 | # do nothing with basenode, it is implicitly the previous one in HG10 |
|
429 | # do nothing with basenode, it is implicitly the previous one in HG10 | |
430 | return struct.pack(self.deltaheader, node, p1n, p2n, linknode) |
|
430 | return struct.pack(self.deltaheader, node, p1n, p2n, linknode) | |
431 |
|
431 | |||
|
432 | def _changegroupinfo(repo, nodes, source): | |||
|
433 | if repo.ui.verbose or source == 'bundle': | |||
|
434 | repo.ui.status(_("%d changesets found\n") % len(nodes)) | |||
|
435 | if repo.ui.debugflag: | |||
|
436 | repo.ui.debug("list of changesets:\n") | |||
|
437 | for node in nodes: | |||
|
438 | repo.ui.debug("%s\n" % hex(node)) | |||
|
439 | ||||
432 | def getsubset(repo, outgoing, bundler, source, fastpath=False): |
|
440 | def getsubset(repo, outgoing, bundler, source, fastpath=False): | |
433 | repo = repo.unfiltered() |
|
441 | repo = repo.unfiltered() | |
434 | commonrevs = outgoing.common |
|
442 | commonrevs = outgoing.common | |
435 | csets = outgoing.missing |
|
443 | csets = outgoing.missing | |
436 | heads = outgoing.missingheads |
|
444 | heads = outgoing.missingheads | |
437 | # We go through the fast path if we get told to, or if all (unfiltered |
|
445 | # We go through the fast path if we get told to, or if all (unfiltered | |
438 | # heads have been requested (since we then know there all linkrevs will |
|
446 | # heads have been requested (since we then know there all linkrevs will | |
439 | # be pulled by the client). |
|
447 | # be pulled by the client). | |
440 | heads.sort() |
|
448 | heads.sort() | |
441 | fastpathlinkrev = fastpath or ( |
|
449 | fastpathlinkrev = fastpath or ( | |
442 | repo.filtername is None and heads == sorted(repo.heads())) |
|
450 | repo.filtername is None and heads == sorted(repo.heads())) | |
443 |
|
451 | |||
444 | repo.hook('preoutgoing', throw=True, source=source) |
|
452 | repo.hook('preoutgoing', throw=True, source=source) | |
445 |
repo |
|
453 | _changegroupinfo(repo, csets, source) | |
446 | gengroup = bundler.generate(commonrevs, csets, fastpathlinkrev, source) |
|
454 | gengroup = bundler.generate(commonrevs, csets, fastpathlinkrev, source) | |
447 | return unbundle10(util.chunkbuffer(gengroup), 'UN') |
|
455 | return unbundle10(util.chunkbuffer(gengroup), 'UN') |
@@ -1,2159 +1,2151 b'' | |||||
1 | # localrepo.py - read/write repository class for mercurial |
|
1 | # localrepo.py - read/write repository class for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 | from node import hex, nullid, short |
|
7 | from node import hex, nullid, short | |
8 | from i18n import _ |
|
8 | from i18n import _ | |
9 | import peer, changegroup, subrepo, discovery, pushkey, obsolete, repoview |
|
9 | import peer, changegroup, subrepo, discovery, pushkey, obsolete, repoview | |
10 | import changelog, dirstate, filelog, manifest, context, bookmarks, phases |
|
10 | import changelog, dirstate, filelog, manifest, context, bookmarks, phases | |
11 | import lock as lockmod |
|
11 | import lock as lockmod | |
12 | import transaction, store, encoding, exchange |
|
12 | import transaction, store, encoding, exchange | |
13 | import scmutil, util, extensions, hook, error, revset |
|
13 | import scmutil, util, extensions, hook, error, revset | |
14 | import match as matchmod |
|
14 | import match as matchmod | |
15 | import merge as mergemod |
|
15 | import merge as mergemod | |
16 | import tags as tagsmod |
|
16 | import tags as tagsmod | |
17 | from lock import release |
|
17 | from lock import release | |
18 | import weakref, errno, os, time, inspect |
|
18 | import weakref, errno, os, time, inspect | |
19 | import branchmap, pathutil |
|
19 | import branchmap, pathutil | |
20 | propertycache = util.propertycache |
|
20 | propertycache = util.propertycache | |
21 | filecache = scmutil.filecache |
|
21 | filecache = scmutil.filecache | |
22 |
|
22 | |||
23 | class repofilecache(filecache): |
|
23 | class repofilecache(filecache): | |
24 | """All filecache usage on repo are done for logic that should be unfiltered |
|
24 | """All filecache usage on repo are done for logic that should be unfiltered | |
25 | """ |
|
25 | """ | |
26 |
|
26 | |||
27 | def __get__(self, repo, type=None): |
|
27 | def __get__(self, repo, type=None): | |
28 | return super(repofilecache, self).__get__(repo.unfiltered(), type) |
|
28 | return super(repofilecache, self).__get__(repo.unfiltered(), type) | |
29 | def __set__(self, repo, value): |
|
29 | def __set__(self, repo, value): | |
30 | return super(repofilecache, self).__set__(repo.unfiltered(), value) |
|
30 | return super(repofilecache, self).__set__(repo.unfiltered(), value) | |
31 | def __delete__(self, repo): |
|
31 | def __delete__(self, repo): | |
32 | return super(repofilecache, self).__delete__(repo.unfiltered()) |
|
32 | return super(repofilecache, self).__delete__(repo.unfiltered()) | |
33 |
|
33 | |||
34 | class storecache(repofilecache): |
|
34 | class storecache(repofilecache): | |
35 | """filecache for files in the store""" |
|
35 | """filecache for files in the store""" | |
36 | def join(self, obj, fname): |
|
36 | def join(self, obj, fname): | |
37 | return obj.sjoin(fname) |
|
37 | return obj.sjoin(fname) | |
38 |
|
38 | |||
39 | class unfilteredpropertycache(propertycache): |
|
39 | class unfilteredpropertycache(propertycache): | |
40 | """propertycache that apply to unfiltered repo only""" |
|
40 | """propertycache that apply to unfiltered repo only""" | |
41 |
|
41 | |||
42 | def __get__(self, repo, type=None): |
|
42 | def __get__(self, repo, type=None): | |
43 | unfi = repo.unfiltered() |
|
43 | unfi = repo.unfiltered() | |
44 | if unfi is repo: |
|
44 | if unfi is repo: | |
45 | return super(unfilteredpropertycache, self).__get__(unfi) |
|
45 | return super(unfilteredpropertycache, self).__get__(unfi) | |
46 | return getattr(unfi, self.name) |
|
46 | return getattr(unfi, self.name) | |
47 |
|
47 | |||
48 | class filteredpropertycache(propertycache): |
|
48 | class filteredpropertycache(propertycache): | |
49 | """propertycache that must take filtering in account""" |
|
49 | """propertycache that must take filtering in account""" | |
50 |
|
50 | |||
51 | def cachevalue(self, obj, value): |
|
51 | def cachevalue(self, obj, value): | |
52 | object.__setattr__(obj, self.name, value) |
|
52 | object.__setattr__(obj, self.name, value) | |
53 |
|
53 | |||
54 |
|
54 | |||
55 | def hasunfilteredcache(repo, name): |
|
55 | def hasunfilteredcache(repo, name): | |
56 | """check if a repo has an unfilteredpropertycache value for <name>""" |
|
56 | """check if a repo has an unfilteredpropertycache value for <name>""" | |
57 | return name in vars(repo.unfiltered()) |
|
57 | return name in vars(repo.unfiltered()) | |
58 |
|
58 | |||
59 | def unfilteredmethod(orig): |
|
59 | def unfilteredmethod(orig): | |
60 | """decorate method that always need to be run on unfiltered version""" |
|
60 | """decorate method that always need to be run on unfiltered version""" | |
61 | def wrapper(repo, *args, **kwargs): |
|
61 | def wrapper(repo, *args, **kwargs): | |
62 | return orig(repo.unfiltered(), *args, **kwargs) |
|
62 | return orig(repo.unfiltered(), *args, **kwargs) | |
63 | return wrapper |
|
63 | return wrapper | |
64 |
|
64 | |||
65 | moderncaps = set(('lookup', 'branchmap', 'pushkey', 'known', 'getbundle')) |
|
65 | moderncaps = set(('lookup', 'branchmap', 'pushkey', 'known', 'getbundle')) | |
66 | legacycaps = moderncaps.union(set(['changegroupsubset'])) |
|
66 | legacycaps = moderncaps.union(set(['changegroupsubset'])) | |
67 |
|
67 | |||
68 | class localpeer(peer.peerrepository): |
|
68 | class localpeer(peer.peerrepository): | |
69 | '''peer for a local repo; reflects only the most recent API''' |
|
69 | '''peer for a local repo; reflects only the most recent API''' | |
70 |
|
70 | |||
71 | def __init__(self, repo, caps=moderncaps): |
|
71 | def __init__(self, repo, caps=moderncaps): | |
72 | peer.peerrepository.__init__(self) |
|
72 | peer.peerrepository.__init__(self) | |
73 | self._repo = repo.filtered('served') |
|
73 | self._repo = repo.filtered('served') | |
74 | self.ui = repo.ui |
|
74 | self.ui = repo.ui | |
75 | self._caps = repo._restrictcapabilities(caps) |
|
75 | self._caps = repo._restrictcapabilities(caps) | |
76 | self.requirements = repo.requirements |
|
76 | self.requirements = repo.requirements | |
77 | self.supportedformats = repo.supportedformats |
|
77 | self.supportedformats = repo.supportedformats | |
78 |
|
78 | |||
79 | def close(self): |
|
79 | def close(self): | |
80 | self._repo.close() |
|
80 | self._repo.close() | |
81 |
|
81 | |||
82 | def _capabilities(self): |
|
82 | def _capabilities(self): | |
83 | return self._caps |
|
83 | return self._caps | |
84 |
|
84 | |||
85 | def local(self): |
|
85 | def local(self): | |
86 | return self._repo |
|
86 | return self._repo | |
87 |
|
87 | |||
88 | def canpush(self): |
|
88 | def canpush(self): | |
89 | return True |
|
89 | return True | |
90 |
|
90 | |||
91 | def url(self): |
|
91 | def url(self): | |
92 | return self._repo.url() |
|
92 | return self._repo.url() | |
93 |
|
93 | |||
94 | def lookup(self, key): |
|
94 | def lookup(self, key): | |
95 | return self._repo.lookup(key) |
|
95 | return self._repo.lookup(key) | |
96 |
|
96 | |||
97 | def branchmap(self): |
|
97 | def branchmap(self): | |
98 | return self._repo.branchmap() |
|
98 | return self._repo.branchmap() | |
99 |
|
99 | |||
100 | def heads(self): |
|
100 | def heads(self): | |
101 | return self._repo.heads() |
|
101 | return self._repo.heads() | |
102 |
|
102 | |||
103 | def known(self, nodes): |
|
103 | def known(self, nodes): | |
104 | return self._repo.known(nodes) |
|
104 | return self._repo.known(nodes) | |
105 |
|
105 | |||
106 | def getbundle(self, source, heads=None, common=None, bundlecaps=None): |
|
106 | def getbundle(self, source, heads=None, common=None, bundlecaps=None): | |
107 | return self._repo.getbundle(source, heads=heads, common=common, |
|
107 | return self._repo.getbundle(source, heads=heads, common=common, | |
108 | bundlecaps=None) |
|
108 | bundlecaps=None) | |
109 |
|
109 | |||
110 | # TODO We might want to move the next two calls into legacypeer and add |
|
110 | # TODO We might want to move the next two calls into legacypeer and add | |
111 | # unbundle instead. |
|
111 | # unbundle instead. | |
112 |
|
112 | |||
113 | def lock(self): |
|
113 | def lock(self): | |
114 | return self._repo.lock() |
|
114 | return self._repo.lock() | |
115 |
|
115 | |||
116 | def addchangegroup(self, cg, source, url): |
|
116 | def addchangegroup(self, cg, source, url): | |
117 | return self._repo.addchangegroup(cg, source, url) |
|
117 | return self._repo.addchangegroup(cg, source, url) | |
118 |
|
118 | |||
119 | def pushkey(self, namespace, key, old, new): |
|
119 | def pushkey(self, namespace, key, old, new): | |
120 | return self._repo.pushkey(namespace, key, old, new) |
|
120 | return self._repo.pushkey(namespace, key, old, new) | |
121 |
|
121 | |||
122 | def listkeys(self, namespace): |
|
122 | def listkeys(self, namespace): | |
123 | return self._repo.listkeys(namespace) |
|
123 | return self._repo.listkeys(namespace) | |
124 |
|
124 | |||
125 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
125 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
126 | '''used to test argument passing over the wire''' |
|
126 | '''used to test argument passing over the wire''' | |
127 | return "%s %s %s %s %s" % (one, two, three, four, five) |
|
127 | return "%s %s %s %s %s" % (one, two, three, four, five) | |
128 |
|
128 | |||
129 | class locallegacypeer(localpeer): |
|
129 | class locallegacypeer(localpeer): | |
130 | '''peer extension which implements legacy methods too; used for tests with |
|
130 | '''peer extension which implements legacy methods too; used for tests with | |
131 | restricted capabilities''' |
|
131 | restricted capabilities''' | |
132 |
|
132 | |||
133 | def __init__(self, repo): |
|
133 | def __init__(self, repo): | |
134 | localpeer.__init__(self, repo, caps=legacycaps) |
|
134 | localpeer.__init__(self, repo, caps=legacycaps) | |
135 |
|
135 | |||
136 | def branches(self, nodes): |
|
136 | def branches(self, nodes): | |
137 | return self._repo.branches(nodes) |
|
137 | return self._repo.branches(nodes) | |
138 |
|
138 | |||
139 | def between(self, pairs): |
|
139 | def between(self, pairs): | |
140 | return self._repo.between(pairs) |
|
140 | return self._repo.between(pairs) | |
141 |
|
141 | |||
142 | def changegroup(self, basenodes, source): |
|
142 | def changegroup(self, basenodes, source): | |
143 | return self._repo.changegroup(basenodes, source) |
|
143 | return self._repo.changegroup(basenodes, source) | |
144 |
|
144 | |||
145 | def changegroupsubset(self, bases, heads, source): |
|
145 | def changegroupsubset(self, bases, heads, source): | |
146 | return self._repo.changegroupsubset(bases, heads, source) |
|
146 | return self._repo.changegroupsubset(bases, heads, source) | |
147 |
|
147 | |||
148 | class localrepository(object): |
|
148 | class localrepository(object): | |
149 |
|
149 | |||
150 | supportedformats = set(('revlogv1', 'generaldelta')) |
|
150 | supportedformats = set(('revlogv1', 'generaldelta')) | |
151 | _basesupported = supportedformats | set(('store', 'fncache', 'shared', |
|
151 | _basesupported = supportedformats | set(('store', 'fncache', 'shared', | |
152 | 'dotencode')) |
|
152 | 'dotencode')) | |
153 | openerreqs = set(('revlogv1', 'generaldelta')) |
|
153 | openerreqs = set(('revlogv1', 'generaldelta')) | |
154 | requirements = ['revlogv1'] |
|
154 | requirements = ['revlogv1'] | |
155 | filtername = None |
|
155 | filtername = None | |
156 |
|
156 | |||
157 | # a list of (ui, featureset) functions. |
|
157 | # a list of (ui, featureset) functions. | |
158 | # only functions defined in module of enabled extensions are invoked |
|
158 | # only functions defined in module of enabled extensions are invoked | |
159 | featuresetupfuncs = set() |
|
159 | featuresetupfuncs = set() | |
160 |
|
160 | |||
161 | def _baserequirements(self, create): |
|
161 | def _baserequirements(self, create): | |
162 | return self.requirements[:] |
|
162 | return self.requirements[:] | |
163 |
|
163 | |||
164 | def __init__(self, baseui, path=None, create=False): |
|
164 | def __init__(self, baseui, path=None, create=False): | |
165 | self.wvfs = scmutil.vfs(path, expandpath=True, realpath=True) |
|
165 | self.wvfs = scmutil.vfs(path, expandpath=True, realpath=True) | |
166 | self.wopener = self.wvfs |
|
166 | self.wopener = self.wvfs | |
167 | self.root = self.wvfs.base |
|
167 | self.root = self.wvfs.base | |
168 | self.path = self.wvfs.join(".hg") |
|
168 | self.path = self.wvfs.join(".hg") | |
169 | self.origroot = path |
|
169 | self.origroot = path | |
170 | self.auditor = pathutil.pathauditor(self.root, self._checknested) |
|
170 | self.auditor = pathutil.pathauditor(self.root, self._checknested) | |
171 | self.vfs = scmutil.vfs(self.path) |
|
171 | self.vfs = scmutil.vfs(self.path) | |
172 | self.opener = self.vfs |
|
172 | self.opener = self.vfs | |
173 | self.baseui = baseui |
|
173 | self.baseui = baseui | |
174 | self.ui = baseui.copy() |
|
174 | self.ui = baseui.copy() | |
175 | self.ui.copy = baseui.copy # prevent copying repo configuration |
|
175 | self.ui.copy = baseui.copy # prevent copying repo configuration | |
176 | # A list of callback to shape the phase if no data were found. |
|
176 | # A list of callback to shape the phase if no data were found. | |
177 | # Callback are in the form: func(repo, roots) --> processed root. |
|
177 | # Callback are in the form: func(repo, roots) --> processed root. | |
178 | # This list it to be filled by extension during repo setup |
|
178 | # This list it to be filled by extension during repo setup | |
179 | self._phasedefaults = [] |
|
179 | self._phasedefaults = [] | |
180 | try: |
|
180 | try: | |
181 | self.ui.readconfig(self.join("hgrc"), self.root) |
|
181 | self.ui.readconfig(self.join("hgrc"), self.root) | |
182 | extensions.loadall(self.ui) |
|
182 | extensions.loadall(self.ui) | |
183 | except IOError: |
|
183 | except IOError: | |
184 | pass |
|
184 | pass | |
185 |
|
185 | |||
186 | if self.featuresetupfuncs: |
|
186 | if self.featuresetupfuncs: | |
187 | self.supported = set(self._basesupported) # use private copy |
|
187 | self.supported = set(self._basesupported) # use private copy | |
188 | extmods = set(m.__name__ for n, m |
|
188 | extmods = set(m.__name__ for n, m | |
189 | in extensions.extensions(self.ui)) |
|
189 | in extensions.extensions(self.ui)) | |
190 | for setupfunc in self.featuresetupfuncs: |
|
190 | for setupfunc in self.featuresetupfuncs: | |
191 | if setupfunc.__module__ in extmods: |
|
191 | if setupfunc.__module__ in extmods: | |
192 | setupfunc(self.ui, self.supported) |
|
192 | setupfunc(self.ui, self.supported) | |
193 | else: |
|
193 | else: | |
194 | self.supported = self._basesupported |
|
194 | self.supported = self._basesupported | |
195 |
|
195 | |||
196 | if not self.vfs.isdir(): |
|
196 | if not self.vfs.isdir(): | |
197 | if create: |
|
197 | if create: | |
198 | if not self.wvfs.exists(): |
|
198 | if not self.wvfs.exists(): | |
199 | self.wvfs.makedirs() |
|
199 | self.wvfs.makedirs() | |
200 | self.vfs.makedir(notindexed=True) |
|
200 | self.vfs.makedir(notindexed=True) | |
201 | requirements = self._baserequirements(create) |
|
201 | requirements = self._baserequirements(create) | |
202 | if self.ui.configbool('format', 'usestore', True): |
|
202 | if self.ui.configbool('format', 'usestore', True): | |
203 | self.vfs.mkdir("store") |
|
203 | self.vfs.mkdir("store") | |
204 | requirements.append("store") |
|
204 | requirements.append("store") | |
205 | if self.ui.configbool('format', 'usefncache', True): |
|
205 | if self.ui.configbool('format', 'usefncache', True): | |
206 | requirements.append("fncache") |
|
206 | requirements.append("fncache") | |
207 | if self.ui.configbool('format', 'dotencode', True): |
|
207 | if self.ui.configbool('format', 'dotencode', True): | |
208 | requirements.append('dotencode') |
|
208 | requirements.append('dotencode') | |
209 | # create an invalid changelog |
|
209 | # create an invalid changelog | |
210 | self.vfs.append( |
|
210 | self.vfs.append( | |
211 | "00changelog.i", |
|
211 | "00changelog.i", | |
212 | '\0\0\0\2' # represents revlogv2 |
|
212 | '\0\0\0\2' # represents revlogv2 | |
213 | ' dummy changelog to prevent using the old repo layout' |
|
213 | ' dummy changelog to prevent using the old repo layout' | |
214 | ) |
|
214 | ) | |
215 | if self.ui.configbool('format', 'generaldelta', False): |
|
215 | if self.ui.configbool('format', 'generaldelta', False): | |
216 | requirements.append("generaldelta") |
|
216 | requirements.append("generaldelta") | |
217 | requirements = set(requirements) |
|
217 | requirements = set(requirements) | |
218 | else: |
|
218 | else: | |
219 | raise error.RepoError(_("repository %s not found") % path) |
|
219 | raise error.RepoError(_("repository %s not found") % path) | |
220 | elif create: |
|
220 | elif create: | |
221 | raise error.RepoError(_("repository %s already exists") % path) |
|
221 | raise error.RepoError(_("repository %s already exists") % path) | |
222 | else: |
|
222 | else: | |
223 | try: |
|
223 | try: | |
224 | requirements = scmutil.readrequires(self.vfs, self.supported) |
|
224 | requirements = scmutil.readrequires(self.vfs, self.supported) | |
225 | except IOError, inst: |
|
225 | except IOError, inst: | |
226 | if inst.errno != errno.ENOENT: |
|
226 | if inst.errno != errno.ENOENT: | |
227 | raise |
|
227 | raise | |
228 | requirements = set() |
|
228 | requirements = set() | |
229 |
|
229 | |||
230 | self.sharedpath = self.path |
|
230 | self.sharedpath = self.path | |
231 | try: |
|
231 | try: | |
232 | vfs = scmutil.vfs(self.vfs.read("sharedpath").rstrip('\n'), |
|
232 | vfs = scmutil.vfs(self.vfs.read("sharedpath").rstrip('\n'), | |
233 | realpath=True) |
|
233 | realpath=True) | |
234 | s = vfs.base |
|
234 | s = vfs.base | |
235 | if not vfs.exists(): |
|
235 | if not vfs.exists(): | |
236 | raise error.RepoError( |
|
236 | raise error.RepoError( | |
237 | _('.hg/sharedpath points to nonexistent directory %s') % s) |
|
237 | _('.hg/sharedpath points to nonexistent directory %s') % s) | |
238 | self.sharedpath = s |
|
238 | self.sharedpath = s | |
239 | except IOError, inst: |
|
239 | except IOError, inst: | |
240 | if inst.errno != errno.ENOENT: |
|
240 | if inst.errno != errno.ENOENT: | |
241 | raise |
|
241 | raise | |
242 |
|
242 | |||
243 | self.store = store.store(requirements, self.sharedpath, scmutil.vfs) |
|
243 | self.store = store.store(requirements, self.sharedpath, scmutil.vfs) | |
244 | self.spath = self.store.path |
|
244 | self.spath = self.store.path | |
245 | self.svfs = self.store.vfs |
|
245 | self.svfs = self.store.vfs | |
246 | self.sopener = self.svfs |
|
246 | self.sopener = self.svfs | |
247 | self.sjoin = self.store.join |
|
247 | self.sjoin = self.store.join | |
248 | self.vfs.createmode = self.store.createmode |
|
248 | self.vfs.createmode = self.store.createmode | |
249 | self._applyrequirements(requirements) |
|
249 | self._applyrequirements(requirements) | |
250 | if create: |
|
250 | if create: | |
251 | self._writerequirements() |
|
251 | self._writerequirements() | |
252 |
|
252 | |||
253 |
|
253 | |||
254 | self._branchcaches = {} |
|
254 | self._branchcaches = {} | |
255 | self.filterpats = {} |
|
255 | self.filterpats = {} | |
256 | self._datafilters = {} |
|
256 | self._datafilters = {} | |
257 | self._transref = self._lockref = self._wlockref = None |
|
257 | self._transref = self._lockref = self._wlockref = None | |
258 |
|
258 | |||
259 | # A cache for various files under .hg/ that tracks file changes, |
|
259 | # A cache for various files under .hg/ that tracks file changes, | |
260 | # (used by the filecache decorator) |
|
260 | # (used by the filecache decorator) | |
261 | # |
|
261 | # | |
262 | # Maps a property name to its util.filecacheentry |
|
262 | # Maps a property name to its util.filecacheentry | |
263 | self._filecache = {} |
|
263 | self._filecache = {} | |
264 |
|
264 | |||
265 | # hold sets of revision to be filtered |
|
265 | # hold sets of revision to be filtered | |
266 | # should be cleared when something might have changed the filter value: |
|
266 | # should be cleared when something might have changed the filter value: | |
267 | # - new changesets, |
|
267 | # - new changesets, | |
268 | # - phase change, |
|
268 | # - phase change, | |
269 | # - new obsolescence marker, |
|
269 | # - new obsolescence marker, | |
270 | # - working directory parent change, |
|
270 | # - working directory parent change, | |
271 | # - bookmark changes |
|
271 | # - bookmark changes | |
272 | self.filteredrevcache = {} |
|
272 | self.filteredrevcache = {} | |
273 |
|
273 | |||
274 | def close(self): |
|
274 | def close(self): | |
275 | pass |
|
275 | pass | |
276 |
|
276 | |||
277 | def _restrictcapabilities(self, caps): |
|
277 | def _restrictcapabilities(self, caps): | |
278 | return caps |
|
278 | return caps | |
279 |
|
279 | |||
280 | def _applyrequirements(self, requirements): |
|
280 | def _applyrequirements(self, requirements): | |
281 | self.requirements = requirements |
|
281 | self.requirements = requirements | |
282 | self.sopener.options = dict((r, 1) for r in requirements |
|
282 | self.sopener.options = dict((r, 1) for r in requirements | |
283 | if r in self.openerreqs) |
|
283 | if r in self.openerreqs) | |
284 | chunkcachesize = self.ui.configint('format', 'chunkcachesize') |
|
284 | chunkcachesize = self.ui.configint('format', 'chunkcachesize') | |
285 | if chunkcachesize is not None: |
|
285 | if chunkcachesize is not None: | |
286 | self.sopener.options['chunkcachesize'] = chunkcachesize |
|
286 | self.sopener.options['chunkcachesize'] = chunkcachesize | |
287 |
|
287 | |||
288 | def _writerequirements(self): |
|
288 | def _writerequirements(self): | |
289 | reqfile = self.opener("requires", "w") |
|
289 | reqfile = self.opener("requires", "w") | |
290 | for r in sorted(self.requirements): |
|
290 | for r in sorted(self.requirements): | |
291 | reqfile.write("%s\n" % r) |
|
291 | reqfile.write("%s\n" % r) | |
292 | reqfile.close() |
|
292 | reqfile.close() | |
293 |
|
293 | |||
294 | def _checknested(self, path): |
|
294 | def _checknested(self, path): | |
295 | """Determine if path is a legal nested repository.""" |
|
295 | """Determine if path is a legal nested repository.""" | |
296 | if not path.startswith(self.root): |
|
296 | if not path.startswith(self.root): | |
297 | return False |
|
297 | return False | |
298 | subpath = path[len(self.root) + 1:] |
|
298 | subpath = path[len(self.root) + 1:] | |
299 | normsubpath = util.pconvert(subpath) |
|
299 | normsubpath = util.pconvert(subpath) | |
300 |
|
300 | |||
301 | # XXX: Checking against the current working copy is wrong in |
|
301 | # XXX: Checking against the current working copy is wrong in | |
302 | # the sense that it can reject things like |
|
302 | # the sense that it can reject things like | |
303 | # |
|
303 | # | |
304 | # $ hg cat -r 10 sub/x.txt |
|
304 | # $ hg cat -r 10 sub/x.txt | |
305 | # |
|
305 | # | |
306 | # if sub/ is no longer a subrepository in the working copy |
|
306 | # if sub/ is no longer a subrepository in the working copy | |
307 | # parent revision. |
|
307 | # parent revision. | |
308 | # |
|
308 | # | |
309 | # However, it can of course also allow things that would have |
|
309 | # However, it can of course also allow things that would have | |
310 | # been rejected before, such as the above cat command if sub/ |
|
310 | # been rejected before, such as the above cat command if sub/ | |
311 | # is a subrepository now, but was a normal directory before. |
|
311 | # is a subrepository now, but was a normal directory before. | |
312 | # The old path auditor would have rejected by mistake since it |
|
312 | # The old path auditor would have rejected by mistake since it | |
313 | # panics when it sees sub/.hg/. |
|
313 | # panics when it sees sub/.hg/. | |
314 | # |
|
314 | # | |
315 | # All in all, checking against the working copy seems sensible |
|
315 | # All in all, checking against the working copy seems sensible | |
316 | # since we want to prevent access to nested repositories on |
|
316 | # since we want to prevent access to nested repositories on | |
317 | # the filesystem *now*. |
|
317 | # the filesystem *now*. | |
318 | ctx = self[None] |
|
318 | ctx = self[None] | |
319 | parts = util.splitpath(subpath) |
|
319 | parts = util.splitpath(subpath) | |
320 | while parts: |
|
320 | while parts: | |
321 | prefix = '/'.join(parts) |
|
321 | prefix = '/'.join(parts) | |
322 | if prefix in ctx.substate: |
|
322 | if prefix in ctx.substate: | |
323 | if prefix == normsubpath: |
|
323 | if prefix == normsubpath: | |
324 | return True |
|
324 | return True | |
325 | else: |
|
325 | else: | |
326 | sub = ctx.sub(prefix) |
|
326 | sub = ctx.sub(prefix) | |
327 | return sub.checknested(subpath[len(prefix) + 1:]) |
|
327 | return sub.checknested(subpath[len(prefix) + 1:]) | |
328 | else: |
|
328 | else: | |
329 | parts.pop() |
|
329 | parts.pop() | |
330 | return False |
|
330 | return False | |
331 |
|
331 | |||
332 | def peer(self): |
|
332 | def peer(self): | |
333 | return localpeer(self) # not cached to avoid reference cycle |
|
333 | return localpeer(self) # not cached to avoid reference cycle | |
334 |
|
334 | |||
335 | def unfiltered(self): |
|
335 | def unfiltered(self): | |
336 | """Return unfiltered version of the repository |
|
336 | """Return unfiltered version of the repository | |
337 |
|
337 | |||
338 | Intended to be overwritten by filtered repo.""" |
|
338 | Intended to be overwritten by filtered repo.""" | |
339 | return self |
|
339 | return self | |
340 |
|
340 | |||
341 | def filtered(self, name): |
|
341 | def filtered(self, name): | |
342 | """Return a filtered version of a repository""" |
|
342 | """Return a filtered version of a repository""" | |
343 | # build a new class with the mixin and the current class |
|
343 | # build a new class with the mixin and the current class | |
344 | # (possibly subclass of the repo) |
|
344 | # (possibly subclass of the repo) | |
345 | class proxycls(repoview.repoview, self.unfiltered().__class__): |
|
345 | class proxycls(repoview.repoview, self.unfiltered().__class__): | |
346 | pass |
|
346 | pass | |
347 | return proxycls(self, name) |
|
347 | return proxycls(self, name) | |
348 |
|
348 | |||
349 | @repofilecache('bookmarks') |
|
349 | @repofilecache('bookmarks') | |
350 | def _bookmarks(self): |
|
350 | def _bookmarks(self): | |
351 | return bookmarks.bmstore(self) |
|
351 | return bookmarks.bmstore(self) | |
352 |
|
352 | |||
353 | @repofilecache('bookmarks.current') |
|
353 | @repofilecache('bookmarks.current') | |
354 | def _bookmarkcurrent(self): |
|
354 | def _bookmarkcurrent(self): | |
355 | return bookmarks.readcurrent(self) |
|
355 | return bookmarks.readcurrent(self) | |
356 |
|
356 | |||
357 | def bookmarkheads(self, bookmark): |
|
357 | def bookmarkheads(self, bookmark): | |
358 | name = bookmark.split('@', 1)[0] |
|
358 | name = bookmark.split('@', 1)[0] | |
359 | heads = [] |
|
359 | heads = [] | |
360 | for mark, n in self._bookmarks.iteritems(): |
|
360 | for mark, n in self._bookmarks.iteritems(): | |
361 | if mark.split('@', 1)[0] == name: |
|
361 | if mark.split('@', 1)[0] == name: | |
362 | heads.append(n) |
|
362 | heads.append(n) | |
363 | return heads |
|
363 | return heads | |
364 |
|
364 | |||
365 | @storecache('phaseroots') |
|
365 | @storecache('phaseroots') | |
366 | def _phasecache(self): |
|
366 | def _phasecache(self): | |
367 | return phases.phasecache(self, self._phasedefaults) |
|
367 | return phases.phasecache(self, self._phasedefaults) | |
368 |
|
368 | |||
369 | @storecache('obsstore') |
|
369 | @storecache('obsstore') | |
370 | def obsstore(self): |
|
370 | def obsstore(self): | |
371 | store = obsolete.obsstore(self.sopener) |
|
371 | store = obsolete.obsstore(self.sopener) | |
372 | if store and not obsolete._enabled: |
|
372 | if store and not obsolete._enabled: | |
373 | # message is rare enough to not be translated |
|
373 | # message is rare enough to not be translated | |
374 | msg = 'obsolete feature not enabled but %i markers found!\n' |
|
374 | msg = 'obsolete feature not enabled but %i markers found!\n' | |
375 | self.ui.warn(msg % len(list(store))) |
|
375 | self.ui.warn(msg % len(list(store))) | |
376 | return store |
|
376 | return store | |
377 |
|
377 | |||
378 | @storecache('00changelog.i') |
|
378 | @storecache('00changelog.i') | |
379 | def changelog(self): |
|
379 | def changelog(self): | |
380 | c = changelog.changelog(self.sopener) |
|
380 | c = changelog.changelog(self.sopener) | |
381 | if 'HG_PENDING' in os.environ: |
|
381 | if 'HG_PENDING' in os.environ: | |
382 | p = os.environ['HG_PENDING'] |
|
382 | p = os.environ['HG_PENDING'] | |
383 | if p.startswith(self.root): |
|
383 | if p.startswith(self.root): | |
384 | c.readpending('00changelog.i.a') |
|
384 | c.readpending('00changelog.i.a') | |
385 | return c |
|
385 | return c | |
386 |
|
386 | |||
387 | @storecache('00manifest.i') |
|
387 | @storecache('00manifest.i') | |
388 | def manifest(self): |
|
388 | def manifest(self): | |
389 | return manifest.manifest(self.sopener) |
|
389 | return manifest.manifest(self.sopener) | |
390 |
|
390 | |||
391 | @repofilecache('dirstate') |
|
391 | @repofilecache('dirstate') | |
392 | def dirstate(self): |
|
392 | def dirstate(self): | |
393 | warned = [0] |
|
393 | warned = [0] | |
394 | def validate(node): |
|
394 | def validate(node): | |
395 | try: |
|
395 | try: | |
396 | self.changelog.rev(node) |
|
396 | self.changelog.rev(node) | |
397 | return node |
|
397 | return node | |
398 | except error.LookupError: |
|
398 | except error.LookupError: | |
399 | if not warned[0]: |
|
399 | if not warned[0]: | |
400 | warned[0] = True |
|
400 | warned[0] = True | |
401 | self.ui.warn(_("warning: ignoring unknown" |
|
401 | self.ui.warn(_("warning: ignoring unknown" | |
402 | " working parent %s!\n") % short(node)) |
|
402 | " working parent %s!\n") % short(node)) | |
403 | return nullid |
|
403 | return nullid | |
404 |
|
404 | |||
405 | return dirstate.dirstate(self.opener, self.ui, self.root, validate) |
|
405 | return dirstate.dirstate(self.opener, self.ui, self.root, validate) | |
406 |
|
406 | |||
407 | def __getitem__(self, changeid): |
|
407 | def __getitem__(self, changeid): | |
408 | if changeid is None: |
|
408 | if changeid is None: | |
409 | return context.workingctx(self) |
|
409 | return context.workingctx(self) | |
410 | return context.changectx(self, changeid) |
|
410 | return context.changectx(self, changeid) | |
411 |
|
411 | |||
412 | def __contains__(self, changeid): |
|
412 | def __contains__(self, changeid): | |
413 | try: |
|
413 | try: | |
414 | return bool(self.lookup(changeid)) |
|
414 | return bool(self.lookup(changeid)) | |
415 | except error.RepoLookupError: |
|
415 | except error.RepoLookupError: | |
416 | return False |
|
416 | return False | |
417 |
|
417 | |||
418 | def __nonzero__(self): |
|
418 | def __nonzero__(self): | |
419 | return True |
|
419 | return True | |
420 |
|
420 | |||
421 | def __len__(self): |
|
421 | def __len__(self): | |
422 | return len(self.changelog) |
|
422 | return len(self.changelog) | |
423 |
|
423 | |||
424 | def __iter__(self): |
|
424 | def __iter__(self): | |
425 | return iter(self.changelog) |
|
425 | return iter(self.changelog) | |
426 |
|
426 | |||
427 | def revs(self, expr, *args): |
|
427 | def revs(self, expr, *args): | |
428 | '''Return a list of revisions matching the given revset''' |
|
428 | '''Return a list of revisions matching the given revset''' | |
429 | expr = revset.formatspec(expr, *args) |
|
429 | expr = revset.formatspec(expr, *args) | |
430 | m = revset.match(None, expr) |
|
430 | m = revset.match(None, expr) | |
431 | return m(self, revset.spanset(self)) |
|
431 | return m(self, revset.spanset(self)) | |
432 |
|
432 | |||
433 | def set(self, expr, *args): |
|
433 | def set(self, expr, *args): | |
434 | ''' |
|
434 | ''' | |
435 | Yield a context for each matching revision, after doing arg |
|
435 | Yield a context for each matching revision, after doing arg | |
436 | replacement via revset.formatspec |
|
436 | replacement via revset.formatspec | |
437 | ''' |
|
437 | ''' | |
438 | for r in self.revs(expr, *args): |
|
438 | for r in self.revs(expr, *args): | |
439 | yield self[r] |
|
439 | yield self[r] | |
440 |
|
440 | |||
441 | def url(self): |
|
441 | def url(self): | |
442 | return 'file:' + self.root |
|
442 | return 'file:' + self.root | |
443 |
|
443 | |||
444 | def hook(self, name, throw=False, **args): |
|
444 | def hook(self, name, throw=False, **args): | |
445 | return hook.hook(self.ui, self, name, throw, **args) |
|
445 | return hook.hook(self.ui, self, name, throw, **args) | |
446 |
|
446 | |||
447 | @unfilteredmethod |
|
447 | @unfilteredmethod | |
448 | def _tag(self, names, node, message, local, user, date, extra={}): |
|
448 | def _tag(self, names, node, message, local, user, date, extra={}): | |
449 | if isinstance(names, str): |
|
449 | if isinstance(names, str): | |
450 | names = (names,) |
|
450 | names = (names,) | |
451 |
|
451 | |||
452 | branches = self.branchmap() |
|
452 | branches = self.branchmap() | |
453 | for name in names: |
|
453 | for name in names: | |
454 | self.hook('pretag', throw=True, node=hex(node), tag=name, |
|
454 | self.hook('pretag', throw=True, node=hex(node), tag=name, | |
455 | local=local) |
|
455 | local=local) | |
456 | if name in branches: |
|
456 | if name in branches: | |
457 | self.ui.warn(_("warning: tag %s conflicts with existing" |
|
457 | self.ui.warn(_("warning: tag %s conflicts with existing" | |
458 | " branch name\n") % name) |
|
458 | " branch name\n") % name) | |
459 |
|
459 | |||
460 | def writetags(fp, names, munge, prevtags): |
|
460 | def writetags(fp, names, munge, prevtags): | |
461 | fp.seek(0, 2) |
|
461 | fp.seek(0, 2) | |
462 | if prevtags and prevtags[-1] != '\n': |
|
462 | if prevtags and prevtags[-1] != '\n': | |
463 | fp.write('\n') |
|
463 | fp.write('\n') | |
464 | for name in names: |
|
464 | for name in names: | |
465 | m = munge and munge(name) or name |
|
465 | m = munge and munge(name) or name | |
466 | if (self._tagscache.tagtypes and |
|
466 | if (self._tagscache.tagtypes and | |
467 | name in self._tagscache.tagtypes): |
|
467 | name in self._tagscache.tagtypes): | |
468 | old = self.tags().get(name, nullid) |
|
468 | old = self.tags().get(name, nullid) | |
469 | fp.write('%s %s\n' % (hex(old), m)) |
|
469 | fp.write('%s %s\n' % (hex(old), m)) | |
470 | fp.write('%s %s\n' % (hex(node), m)) |
|
470 | fp.write('%s %s\n' % (hex(node), m)) | |
471 | fp.close() |
|
471 | fp.close() | |
472 |
|
472 | |||
473 | prevtags = '' |
|
473 | prevtags = '' | |
474 | if local: |
|
474 | if local: | |
475 | try: |
|
475 | try: | |
476 | fp = self.opener('localtags', 'r+') |
|
476 | fp = self.opener('localtags', 'r+') | |
477 | except IOError: |
|
477 | except IOError: | |
478 | fp = self.opener('localtags', 'a') |
|
478 | fp = self.opener('localtags', 'a') | |
479 | else: |
|
479 | else: | |
480 | prevtags = fp.read() |
|
480 | prevtags = fp.read() | |
481 |
|
481 | |||
482 | # local tags are stored in the current charset |
|
482 | # local tags are stored in the current charset | |
483 | writetags(fp, names, None, prevtags) |
|
483 | writetags(fp, names, None, prevtags) | |
484 | for name in names: |
|
484 | for name in names: | |
485 | self.hook('tag', node=hex(node), tag=name, local=local) |
|
485 | self.hook('tag', node=hex(node), tag=name, local=local) | |
486 | return |
|
486 | return | |
487 |
|
487 | |||
488 | try: |
|
488 | try: | |
489 | fp = self.wfile('.hgtags', 'rb+') |
|
489 | fp = self.wfile('.hgtags', 'rb+') | |
490 | except IOError, e: |
|
490 | except IOError, e: | |
491 | if e.errno != errno.ENOENT: |
|
491 | if e.errno != errno.ENOENT: | |
492 | raise |
|
492 | raise | |
493 | fp = self.wfile('.hgtags', 'ab') |
|
493 | fp = self.wfile('.hgtags', 'ab') | |
494 | else: |
|
494 | else: | |
495 | prevtags = fp.read() |
|
495 | prevtags = fp.read() | |
496 |
|
496 | |||
497 | # committed tags are stored in UTF-8 |
|
497 | # committed tags are stored in UTF-8 | |
498 | writetags(fp, names, encoding.fromlocal, prevtags) |
|
498 | writetags(fp, names, encoding.fromlocal, prevtags) | |
499 |
|
499 | |||
500 | fp.close() |
|
500 | fp.close() | |
501 |
|
501 | |||
502 | self.invalidatecaches() |
|
502 | self.invalidatecaches() | |
503 |
|
503 | |||
504 | if '.hgtags' not in self.dirstate: |
|
504 | if '.hgtags' not in self.dirstate: | |
505 | self[None].add(['.hgtags']) |
|
505 | self[None].add(['.hgtags']) | |
506 |
|
506 | |||
507 | m = matchmod.exact(self.root, '', ['.hgtags']) |
|
507 | m = matchmod.exact(self.root, '', ['.hgtags']) | |
508 | tagnode = self.commit(message, user, date, extra=extra, match=m) |
|
508 | tagnode = self.commit(message, user, date, extra=extra, match=m) | |
509 |
|
509 | |||
510 | for name in names: |
|
510 | for name in names: | |
511 | self.hook('tag', node=hex(node), tag=name, local=local) |
|
511 | self.hook('tag', node=hex(node), tag=name, local=local) | |
512 |
|
512 | |||
513 | return tagnode |
|
513 | return tagnode | |
514 |
|
514 | |||
515 | def tag(self, names, node, message, local, user, date): |
|
515 | def tag(self, names, node, message, local, user, date): | |
516 | '''tag a revision with one or more symbolic names. |
|
516 | '''tag a revision with one or more symbolic names. | |
517 |
|
517 | |||
518 | names is a list of strings or, when adding a single tag, names may be a |
|
518 | names is a list of strings or, when adding a single tag, names may be a | |
519 | string. |
|
519 | string. | |
520 |
|
520 | |||
521 | if local is True, the tags are stored in a per-repository file. |
|
521 | if local is True, the tags are stored in a per-repository file. | |
522 | otherwise, they are stored in the .hgtags file, and a new |
|
522 | otherwise, they are stored in the .hgtags file, and a new | |
523 | changeset is committed with the change. |
|
523 | changeset is committed with the change. | |
524 |
|
524 | |||
525 | keyword arguments: |
|
525 | keyword arguments: | |
526 |
|
526 | |||
527 | local: whether to store tags in non-version-controlled file |
|
527 | local: whether to store tags in non-version-controlled file | |
528 | (default False) |
|
528 | (default False) | |
529 |
|
529 | |||
530 | message: commit message to use if committing |
|
530 | message: commit message to use if committing | |
531 |
|
531 | |||
532 | user: name of user to use if committing |
|
532 | user: name of user to use if committing | |
533 |
|
533 | |||
534 | date: date tuple to use if committing''' |
|
534 | date: date tuple to use if committing''' | |
535 |
|
535 | |||
536 | if not local: |
|
536 | if not local: | |
537 | for x in self.status()[:5]: |
|
537 | for x in self.status()[:5]: | |
538 | if '.hgtags' in x: |
|
538 | if '.hgtags' in x: | |
539 | raise util.Abort(_('working copy of .hgtags is changed ' |
|
539 | raise util.Abort(_('working copy of .hgtags is changed ' | |
540 | '(please commit .hgtags manually)')) |
|
540 | '(please commit .hgtags manually)')) | |
541 |
|
541 | |||
542 | self.tags() # instantiate the cache |
|
542 | self.tags() # instantiate the cache | |
543 | self._tag(names, node, message, local, user, date) |
|
543 | self._tag(names, node, message, local, user, date) | |
544 |
|
544 | |||
545 | @filteredpropertycache |
|
545 | @filteredpropertycache | |
546 | def _tagscache(self): |
|
546 | def _tagscache(self): | |
547 | '''Returns a tagscache object that contains various tags related |
|
547 | '''Returns a tagscache object that contains various tags related | |
548 | caches.''' |
|
548 | caches.''' | |
549 |
|
549 | |||
550 | # This simplifies its cache management by having one decorated |
|
550 | # This simplifies its cache management by having one decorated | |
551 | # function (this one) and the rest simply fetch things from it. |
|
551 | # function (this one) and the rest simply fetch things from it. | |
552 | class tagscache(object): |
|
552 | class tagscache(object): | |
553 | def __init__(self): |
|
553 | def __init__(self): | |
554 | # These two define the set of tags for this repository. tags |
|
554 | # These two define the set of tags for this repository. tags | |
555 | # maps tag name to node; tagtypes maps tag name to 'global' or |
|
555 | # maps tag name to node; tagtypes maps tag name to 'global' or | |
556 | # 'local'. (Global tags are defined by .hgtags across all |
|
556 | # 'local'. (Global tags are defined by .hgtags across all | |
557 | # heads, and local tags are defined in .hg/localtags.) |
|
557 | # heads, and local tags are defined in .hg/localtags.) | |
558 | # They constitute the in-memory cache of tags. |
|
558 | # They constitute the in-memory cache of tags. | |
559 | self.tags = self.tagtypes = None |
|
559 | self.tags = self.tagtypes = None | |
560 |
|
560 | |||
561 | self.nodetagscache = self.tagslist = None |
|
561 | self.nodetagscache = self.tagslist = None | |
562 |
|
562 | |||
563 | cache = tagscache() |
|
563 | cache = tagscache() | |
564 | cache.tags, cache.tagtypes = self._findtags() |
|
564 | cache.tags, cache.tagtypes = self._findtags() | |
565 |
|
565 | |||
566 | return cache |
|
566 | return cache | |
567 |
|
567 | |||
568 | def tags(self): |
|
568 | def tags(self): | |
569 | '''return a mapping of tag to node''' |
|
569 | '''return a mapping of tag to node''' | |
570 | t = {} |
|
570 | t = {} | |
571 | if self.changelog.filteredrevs: |
|
571 | if self.changelog.filteredrevs: | |
572 | tags, tt = self._findtags() |
|
572 | tags, tt = self._findtags() | |
573 | else: |
|
573 | else: | |
574 | tags = self._tagscache.tags |
|
574 | tags = self._tagscache.tags | |
575 | for k, v in tags.iteritems(): |
|
575 | for k, v in tags.iteritems(): | |
576 | try: |
|
576 | try: | |
577 | # ignore tags to unknown nodes |
|
577 | # ignore tags to unknown nodes | |
578 | self.changelog.rev(v) |
|
578 | self.changelog.rev(v) | |
579 | t[k] = v |
|
579 | t[k] = v | |
580 | except (error.LookupError, ValueError): |
|
580 | except (error.LookupError, ValueError): | |
581 | pass |
|
581 | pass | |
582 | return t |
|
582 | return t | |
583 |
|
583 | |||
584 | def _findtags(self): |
|
584 | def _findtags(self): | |
585 | '''Do the hard work of finding tags. Return a pair of dicts |
|
585 | '''Do the hard work of finding tags. Return a pair of dicts | |
586 | (tags, tagtypes) where tags maps tag name to node, and tagtypes |
|
586 | (tags, tagtypes) where tags maps tag name to node, and tagtypes | |
587 | maps tag name to a string like \'global\' or \'local\'. |
|
587 | maps tag name to a string like \'global\' or \'local\'. | |
588 | Subclasses or extensions are free to add their own tags, but |
|
588 | Subclasses or extensions are free to add their own tags, but | |
589 | should be aware that the returned dicts will be retained for the |
|
589 | should be aware that the returned dicts will be retained for the | |
590 | duration of the localrepo object.''' |
|
590 | duration of the localrepo object.''' | |
591 |
|
591 | |||
592 | # XXX what tagtype should subclasses/extensions use? Currently |
|
592 | # XXX what tagtype should subclasses/extensions use? Currently | |
593 | # mq and bookmarks add tags, but do not set the tagtype at all. |
|
593 | # mq and bookmarks add tags, but do not set the tagtype at all. | |
594 | # Should each extension invent its own tag type? Should there |
|
594 | # Should each extension invent its own tag type? Should there | |
595 | # be one tagtype for all such "virtual" tags? Or is the status |
|
595 | # be one tagtype for all such "virtual" tags? Or is the status | |
596 | # quo fine? |
|
596 | # quo fine? | |
597 |
|
597 | |||
598 | alltags = {} # map tag name to (node, hist) |
|
598 | alltags = {} # map tag name to (node, hist) | |
599 | tagtypes = {} |
|
599 | tagtypes = {} | |
600 |
|
600 | |||
601 | tagsmod.findglobaltags(self.ui, self, alltags, tagtypes) |
|
601 | tagsmod.findglobaltags(self.ui, self, alltags, tagtypes) | |
602 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) |
|
602 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) | |
603 |
|
603 | |||
604 | # Build the return dicts. Have to re-encode tag names because |
|
604 | # Build the return dicts. Have to re-encode tag names because | |
605 | # the tags module always uses UTF-8 (in order not to lose info |
|
605 | # the tags module always uses UTF-8 (in order not to lose info | |
606 | # writing to the cache), but the rest of Mercurial wants them in |
|
606 | # writing to the cache), but the rest of Mercurial wants them in | |
607 | # local encoding. |
|
607 | # local encoding. | |
608 | tags = {} |
|
608 | tags = {} | |
609 | for (name, (node, hist)) in alltags.iteritems(): |
|
609 | for (name, (node, hist)) in alltags.iteritems(): | |
610 | if node != nullid: |
|
610 | if node != nullid: | |
611 | tags[encoding.tolocal(name)] = node |
|
611 | tags[encoding.tolocal(name)] = node | |
612 | tags['tip'] = self.changelog.tip() |
|
612 | tags['tip'] = self.changelog.tip() | |
613 | tagtypes = dict([(encoding.tolocal(name), value) |
|
613 | tagtypes = dict([(encoding.tolocal(name), value) | |
614 | for (name, value) in tagtypes.iteritems()]) |
|
614 | for (name, value) in tagtypes.iteritems()]) | |
615 | return (tags, tagtypes) |
|
615 | return (tags, tagtypes) | |
616 |
|
616 | |||
617 | def tagtype(self, tagname): |
|
617 | def tagtype(self, tagname): | |
618 | ''' |
|
618 | ''' | |
619 | return the type of the given tag. result can be: |
|
619 | return the type of the given tag. result can be: | |
620 |
|
620 | |||
621 | 'local' : a local tag |
|
621 | 'local' : a local tag | |
622 | 'global' : a global tag |
|
622 | 'global' : a global tag | |
623 | None : tag does not exist |
|
623 | None : tag does not exist | |
624 | ''' |
|
624 | ''' | |
625 |
|
625 | |||
626 | return self._tagscache.tagtypes.get(tagname) |
|
626 | return self._tagscache.tagtypes.get(tagname) | |
627 |
|
627 | |||
628 | def tagslist(self): |
|
628 | def tagslist(self): | |
629 | '''return a list of tags ordered by revision''' |
|
629 | '''return a list of tags ordered by revision''' | |
630 | if not self._tagscache.tagslist: |
|
630 | if not self._tagscache.tagslist: | |
631 | l = [] |
|
631 | l = [] | |
632 | for t, n in self.tags().iteritems(): |
|
632 | for t, n in self.tags().iteritems(): | |
633 | r = self.changelog.rev(n) |
|
633 | r = self.changelog.rev(n) | |
634 | l.append((r, t, n)) |
|
634 | l.append((r, t, n)) | |
635 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] |
|
635 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] | |
636 |
|
636 | |||
637 | return self._tagscache.tagslist |
|
637 | return self._tagscache.tagslist | |
638 |
|
638 | |||
639 | def nodetags(self, node): |
|
639 | def nodetags(self, node): | |
640 | '''return the tags associated with a node''' |
|
640 | '''return the tags associated with a node''' | |
641 | if not self._tagscache.nodetagscache: |
|
641 | if not self._tagscache.nodetagscache: | |
642 | nodetagscache = {} |
|
642 | nodetagscache = {} | |
643 | for t, n in self._tagscache.tags.iteritems(): |
|
643 | for t, n in self._tagscache.tags.iteritems(): | |
644 | nodetagscache.setdefault(n, []).append(t) |
|
644 | nodetagscache.setdefault(n, []).append(t) | |
645 | for tags in nodetagscache.itervalues(): |
|
645 | for tags in nodetagscache.itervalues(): | |
646 | tags.sort() |
|
646 | tags.sort() | |
647 | self._tagscache.nodetagscache = nodetagscache |
|
647 | self._tagscache.nodetagscache = nodetagscache | |
648 | return self._tagscache.nodetagscache.get(node, []) |
|
648 | return self._tagscache.nodetagscache.get(node, []) | |
649 |
|
649 | |||
650 | def nodebookmarks(self, node): |
|
650 | def nodebookmarks(self, node): | |
651 | marks = [] |
|
651 | marks = [] | |
652 | for bookmark, n in self._bookmarks.iteritems(): |
|
652 | for bookmark, n in self._bookmarks.iteritems(): | |
653 | if n == node: |
|
653 | if n == node: | |
654 | marks.append(bookmark) |
|
654 | marks.append(bookmark) | |
655 | return sorted(marks) |
|
655 | return sorted(marks) | |
656 |
|
656 | |||
657 | def branchmap(self): |
|
657 | def branchmap(self): | |
658 | '''returns a dictionary {branch: [branchheads]} with branchheads |
|
658 | '''returns a dictionary {branch: [branchheads]} with branchheads | |
659 | ordered by increasing revision number''' |
|
659 | ordered by increasing revision number''' | |
660 | branchmap.updatecache(self) |
|
660 | branchmap.updatecache(self) | |
661 | return self._branchcaches[self.filtername] |
|
661 | return self._branchcaches[self.filtername] | |
662 |
|
662 | |||
663 | def branchtip(self, branch): |
|
663 | def branchtip(self, branch): | |
664 | '''return the tip node for a given branch''' |
|
664 | '''return the tip node for a given branch''' | |
665 | try: |
|
665 | try: | |
666 | return self.branchmap().branchtip(branch) |
|
666 | return self.branchmap().branchtip(branch) | |
667 | except KeyError: |
|
667 | except KeyError: | |
668 | raise error.RepoLookupError(_("unknown branch '%s'") % branch) |
|
668 | raise error.RepoLookupError(_("unknown branch '%s'") % branch) | |
669 |
|
669 | |||
670 | def lookup(self, key): |
|
670 | def lookup(self, key): | |
671 | return self[key].node() |
|
671 | return self[key].node() | |
672 |
|
672 | |||
673 | def lookupbranch(self, key, remote=None): |
|
673 | def lookupbranch(self, key, remote=None): | |
674 | repo = remote or self |
|
674 | repo = remote or self | |
675 | if key in repo.branchmap(): |
|
675 | if key in repo.branchmap(): | |
676 | return key |
|
676 | return key | |
677 |
|
677 | |||
678 | repo = (remote and remote.local()) and remote or self |
|
678 | repo = (remote and remote.local()) and remote or self | |
679 | return repo[key].branch() |
|
679 | return repo[key].branch() | |
680 |
|
680 | |||
681 | def known(self, nodes): |
|
681 | def known(self, nodes): | |
682 | nm = self.changelog.nodemap |
|
682 | nm = self.changelog.nodemap | |
683 | pc = self._phasecache |
|
683 | pc = self._phasecache | |
684 | result = [] |
|
684 | result = [] | |
685 | for n in nodes: |
|
685 | for n in nodes: | |
686 | r = nm.get(n) |
|
686 | r = nm.get(n) | |
687 | resp = not (r is None or pc.phase(self, r) >= phases.secret) |
|
687 | resp = not (r is None or pc.phase(self, r) >= phases.secret) | |
688 | result.append(resp) |
|
688 | result.append(resp) | |
689 | return result |
|
689 | return result | |
690 |
|
690 | |||
691 | def local(self): |
|
691 | def local(self): | |
692 | return self |
|
692 | return self | |
693 |
|
693 | |||
694 | def cancopy(self): |
|
694 | def cancopy(self): | |
695 | # so statichttprepo's override of local() works |
|
695 | # so statichttprepo's override of local() works | |
696 | if not self.local(): |
|
696 | if not self.local(): | |
697 | return False |
|
697 | return False | |
698 | if not self.ui.configbool('phases', 'publish', True): |
|
698 | if not self.ui.configbool('phases', 'publish', True): | |
699 | return True |
|
699 | return True | |
700 | # if publishing we can't copy if there is filtered content |
|
700 | # if publishing we can't copy if there is filtered content | |
701 | return not self.filtered('visible').changelog.filteredrevs |
|
701 | return not self.filtered('visible').changelog.filteredrevs | |
702 |
|
702 | |||
703 | def join(self, f): |
|
703 | def join(self, f): | |
704 | return os.path.join(self.path, f) |
|
704 | return os.path.join(self.path, f) | |
705 |
|
705 | |||
706 | def wjoin(self, f): |
|
706 | def wjoin(self, f): | |
707 | return os.path.join(self.root, f) |
|
707 | return os.path.join(self.root, f) | |
708 |
|
708 | |||
709 | def file(self, f): |
|
709 | def file(self, f): | |
710 | if f[0] == '/': |
|
710 | if f[0] == '/': | |
711 | f = f[1:] |
|
711 | f = f[1:] | |
712 | return filelog.filelog(self.sopener, f) |
|
712 | return filelog.filelog(self.sopener, f) | |
713 |
|
713 | |||
714 | def changectx(self, changeid): |
|
714 | def changectx(self, changeid): | |
715 | return self[changeid] |
|
715 | return self[changeid] | |
716 |
|
716 | |||
717 | def parents(self, changeid=None): |
|
717 | def parents(self, changeid=None): | |
718 | '''get list of changectxs for parents of changeid''' |
|
718 | '''get list of changectxs for parents of changeid''' | |
719 | return self[changeid].parents() |
|
719 | return self[changeid].parents() | |
720 |
|
720 | |||
721 | def setparents(self, p1, p2=nullid): |
|
721 | def setparents(self, p1, p2=nullid): | |
722 | copies = self.dirstate.setparents(p1, p2) |
|
722 | copies = self.dirstate.setparents(p1, p2) | |
723 | pctx = self[p1] |
|
723 | pctx = self[p1] | |
724 | if copies: |
|
724 | if copies: | |
725 | # Adjust copy records, the dirstate cannot do it, it |
|
725 | # Adjust copy records, the dirstate cannot do it, it | |
726 | # requires access to parents manifests. Preserve them |
|
726 | # requires access to parents manifests. Preserve them | |
727 | # only for entries added to first parent. |
|
727 | # only for entries added to first parent. | |
728 | for f in copies: |
|
728 | for f in copies: | |
729 | if f not in pctx and copies[f] in pctx: |
|
729 | if f not in pctx and copies[f] in pctx: | |
730 | self.dirstate.copy(copies[f], f) |
|
730 | self.dirstate.copy(copies[f], f) | |
731 | if p2 == nullid: |
|
731 | if p2 == nullid: | |
732 | for f, s in sorted(self.dirstate.copies().items()): |
|
732 | for f, s in sorted(self.dirstate.copies().items()): | |
733 | if f not in pctx and s not in pctx: |
|
733 | if f not in pctx and s not in pctx: | |
734 | self.dirstate.copy(None, f) |
|
734 | self.dirstate.copy(None, f) | |
735 |
|
735 | |||
736 | def filectx(self, path, changeid=None, fileid=None): |
|
736 | def filectx(self, path, changeid=None, fileid=None): | |
737 | """changeid can be a changeset revision, node, or tag. |
|
737 | """changeid can be a changeset revision, node, or tag. | |
738 | fileid can be a file revision or node.""" |
|
738 | fileid can be a file revision or node.""" | |
739 | return context.filectx(self, path, changeid, fileid) |
|
739 | return context.filectx(self, path, changeid, fileid) | |
740 |
|
740 | |||
741 | def getcwd(self): |
|
741 | def getcwd(self): | |
742 | return self.dirstate.getcwd() |
|
742 | return self.dirstate.getcwd() | |
743 |
|
743 | |||
744 | def pathto(self, f, cwd=None): |
|
744 | def pathto(self, f, cwd=None): | |
745 | return self.dirstate.pathto(f, cwd) |
|
745 | return self.dirstate.pathto(f, cwd) | |
746 |
|
746 | |||
747 | def wfile(self, f, mode='r'): |
|
747 | def wfile(self, f, mode='r'): | |
748 | return self.wopener(f, mode) |
|
748 | return self.wopener(f, mode) | |
749 |
|
749 | |||
750 | def _link(self, f): |
|
750 | def _link(self, f): | |
751 | return self.wvfs.islink(f) |
|
751 | return self.wvfs.islink(f) | |
752 |
|
752 | |||
753 | def _loadfilter(self, filter): |
|
753 | def _loadfilter(self, filter): | |
754 | if filter not in self.filterpats: |
|
754 | if filter not in self.filterpats: | |
755 | l = [] |
|
755 | l = [] | |
756 | for pat, cmd in self.ui.configitems(filter): |
|
756 | for pat, cmd in self.ui.configitems(filter): | |
757 | if cmd == '!': |
|
757 | if cmd == '!': | |
758 | continue |
|
758 | continue | |
759 | mf = matchmod.match(self.root, '', [pat]) |
|
759 | mf = matchmod.match(self.root, '', [pat]) | |
760 | fn = None |
|
760 | fn = None | |
761 | params = cmd |
|
761 | params = cmd | |
762 | for name, filterfn in self._datafilters.iteritems(): |
|
762 | for name, filterfn in self._datafilters.iteritems(): | |
763 | if cmd.startswith(name): |
|
763 | if cmd.startswith(name): | |
764 | fn = filterfn |
|
764 | fn = filterfn | |
765 | params = cmd[len(name):].lstrip() |
|
765 | params = cmd[len(name):].lstrip() | |
766 | break |
|
766 | break | |
767 | if not fn: |
|
767 | if not fn: | |
768 | fn = lambda s, c, **kwargs: util.filter(s, c) |
|
768 | fn = lambda s, c, **kwargs: util.filter(s, c) | |
769 | # Wrap old filters not supporting keyword arguments |
|
769 | # Wrap old filters not supporting keyword arguments | |
770 | if not inspect.getargspec(fn)[2]: |
|
770 | if not inspect.getargspec(fn)[2]: | |
771 | oldfn = fn |
|
771 | oldfn = fn | |
772 | fn = lambda s, c, **kwargs: oldfn(s, c) |
|
772 | fn = lambda s, c, **kwargs: oldfn(s, c) | |
773 | l.append((mf, fn, params)) |
|
773 | l.append((mf, fn, params)) | |
774 | self.filterpats[filter] = l |
|
774 | self.filterpats[filter] = l | |
775 | return self.filterpats[filter] |
|
775 | return self.filterpats[filter] | |
776 |
|
776 | |||
777 | def _filter(self, filterpats, filename, data): |
|
777 | def _filter(self, filterpats, filename, data): | |
778 | for mf, fn, cmd in filterpats: |
|
778 | for mf, fn, cmd in filterpats: | |
779 | if mf(filename): |
|
779 | if mf(filename): | |
780 | self.ui.debug("filtering %s through %s\n" % (filename, cmd)) |
|
780 | self.ui.debug("filtering %s through %s\n" % (filename, cmd)) | |
781 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) |
|
781 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) | |
782 | break |
|
782 | break | |
783 |
|
783 | |||
784 | return data |
|
784 | return data | |
785 |
|
785 | |||
786 | @unfilteredpropertycache |
|
786 | @unfilteredpropertycache | |
787 | def _encodefilterpats(self): |
|
787 | def _encodefilterpats(self): | |
788 | return self._loadfilter('encode') |
|
788 | return self._loadfilter('encode') | |
789 |
|
789 | |||
790 | @unfilteredpropertycache |
|
790 | @unfilteredpropertycache | |
791 | def _decodefilterpats(self): |
|
791 | def _decodefilterpats(self): | |
792 | return self._loadfilter('decode') |
|
792 | return self._loadfilter('decode') | |
793 |
|
793 | |||
794 | def adddatafilter(self, name, filter): |
|
794 | def adddatafilter(self, name, filter): | |
795 | self._datafilters[name] = filter |
|
795 | self._datafilters[name] = filter | |
796 |
|
796 | |||
797 | def wread(self, filename): |
|
797 | def wread(self, filename): | |
798 | if self._link(filename): |
|
798 | if self._link(filename): | |
799 | data = self.wvfs.readlink(filename) |
|
799 | data = self.wvfs.readlink(filename) | |
800 | else: |
|
800 | else: | |
801 | data = self.wopener.read(filename) |
|
801 | data = self.wopener.read(filename) | |
802 | return self._filter(self._encodefilterpats, filename, data) |
|
802 | return self._filter(self._encodefilterpats, filename, data) | |
803 |
|
803 | |||
804 | def wwrite(self, filename, data, flags): |
|
804 | def wwrite(self, filename, data, flags): | |
805 | data = self._filter(self._decodefilterpats, filename, data) |
|
805 | data = self._filter(self._decodefilterpats, filename, data) | |
806 | if 'l' in flags: |
|
806 | if 'l' in flags: | |
807 | self.wopener.symlink(data, filename) |
|
807 | self.wopener.symlink(data, filename) | |
808 | else: |
|
808 | else: | |
809 | self.wopener.write(filename, data) |
|
809 | self.wopener.write(filename, data) | |
810 | if 'x' in flags: |
|
810 | if 'x' in flags: | |
811 | self.wvfs.setflags(filename, False, True) |
|
811 | self.wvfs.setflags(filename, False, True) | |
812 |
|
812 | |||
813 | def wwritedata(self, filename, data): |
|
813 | def wwritedata(self, filename, data): | |
814 | return self._filter(self._decodefilterpats, filename, data) |
|
814 | return self._filter(self._decodefilterpats, filename, data) | |
815 |
|
815 | |||
816 | def transaction(self, desc, report=None): |
|
816 | def transaction(self, desc, report=None): | |
817 | tr = self._transref and self._transref() or None |
|
817 | tr = self._transref and self._transref() or None | |
818 | if tr and tr.running(): |
|
818 | if tr and tr.running(): | |
819 | return tr.nest() |
|
819 | return tr.nest() | |
820 |
|
820 | |||
821 | # abort here if the journal already exists |
|
821 | # abort here if the journal already exists | |
822 | if self.svfs.exists("journal"): |
|
822 | if self.svfs.exists("journal"): | |
823 | raise error.RepoError( |
|
823 | raise error.RepoError( | |
824 | _("abandoned transaction found - run hg recover")) |
|
824 | _("abandoned transaction found - run hg recover")) | |
825 |
|
825 | |||
826 | def onclose(): |
|
826 | def onclose(): | |
827 | self.store.write(tr) |
|
827 | self.store.write(tr) | |
828 |
|
828 | |||
829 | self._writejournal(desc) |
|
829 | self._writejournal(desc) | |
830 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
|
830 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] | |
831 | rp = report and report or self.ui.warn |
|
831 | rp = report and report or self.ui.warn | |
832 | tr = transaction.transaction(rp, self.sopener, |
|
832 | tr = transaction.transaction(rp, self.sopener, | |
833 | "journal", |
|
833 | "journal", | |
834 | aftertrans(renames), |
|
834 | aftertrans(renames), | |
835 | self.store.createmode, |
|
835 | self.store.createmode, | |
836 | onclose) |
|
836 | onclose) | |
837 | self._transref = weakref.ref(tr) |
|
837 | self._transref = weakref.ref(tr) | |
838 | return tr |
|
838 | return tr | |
839 |
|
839 | |||
840 | def _journalfiles(self): |
|
840 | def _journalfiles(self): | |
841 | return ((self.svfs, 'journal'), |
|
841 | return ((self.svfs, 'journal'), | |
842 | (self.vfs, 'journal.dirstate'), |
|
842 | (self.vfs, 'journal.dirstate'), | |
843 | (self.vfs, 'journal.branch'), |
|
843 | (self.vfs, 'journal.branch'), | |
844 | (self.vfs, 'journal.desc'), |
|
844 | (self.vfs, 'journal.desc'), | |
845 | (self.vfs, 'journal.bookmarks'), |
|
845 | (self.vfs, 'journal.bookmarks'), | |
846 | (self.svfs, 'journal.phaseroots')) |
|
846 | (self.svfs, 'journal.phaseroots')) | |
847 |
|
847 | |||
848 | def undofiles(self): |
|
848 | def undofiles(self): | |
849 | return [vfs.join(undoname(x)) for vfs, x in self._journalfiles()] |
|
849 | return [vfs.join(undoname(x)) for vfs, x in self._journalfiles()] | |
850 |
|
850 | |||
851 | def _writejournal(self, desc): |
|
851 | def _writejournal(self, desc): | |
852 | self.opener.write("journal.dirstate", |
|
852 | self.opener.write("journal.dirstate", | |
853 | self.opener.tryread("dirstate")) |
|
853 | self.opener.tryread("dirstate")) | |
854 | self.opener.write("journal.branch", |
|
854 | self.opener.write("journal.branch", | |
855 | encoding.fromlocal(self.dirstate.branch())) |
|
855 | encoding.fromlocal(self.dirstate.branch())) | |
856 | self.opener.write("journal.desc", |
|
856 | self.opener.write("journal.desc", | |
857 | "%d\n%s\n" % (len(self), desc)) |
|
857 | "%d\n%s\n" % (len(self), desc)) | |
858 | self.opener.write("journal.bookmarks", |
|
858 | self.opener.write("journal.bookmarks", | |
859 | self.opener.tryread("bookmarks")) |
|
859 | self.opener.tryread("bookmarks")) | |
860 | self.sopener.write("journal.phaseroots", |
|
860 | self.sopener.write("journal.phaseroots", | |
861 | self.sopener.tryread("phaseroots")) |
|
861 | self.sopener.tryread("phaseroots")) | |
862 |
|
862 | |||
863 | def recover(self): |
|
863 | def recover(self): | |
864 | lock = self.lock() |
|
864 | lock = self.lock() | |
865 | try: |
|
865 | try: | |
866 | if self.svfs.exists("journal"): |
|
866 | if self.svfs.exists("journal"): | |
867 | self.ui.status(_("rolling back interrupted transaction\n")) |
|
867 | self.ui.status(_("rolling back interrupted transaction\n")) | |
868 | transaction.rollback(self.sopener, "journal", |
|
868 | transaction.rollback(self.sopener, "journal", | |
869 | self.ui.warn) |
|
869 | self.ui.warn) | |
870 | self.invalidate() |
|
870 | self.invalidate() | |
871 | return True |
|
871 | return True | |
872 | else: |
|
872 | else: | |
873 | self.ui.warn(_("no interrupted transaction available\n")) |
|
873 | self.ui.warn(_("no interrupted transaction available\n")) | |
874 | return False |
|
874 | return False | |
875 | finally: |
|
875 | finally: | |
876 | lock.release() |
|
876 | lock.release() | |
877 |
|
877 | |||
878 | def rollback(self, dryrun=False, force=False): |
|
878 | def rollback(self, dryrun=False, force=False): | |
879 | wlock = lock = None |
|
879 | wlock = lock = None | |
880 | try: |
|
880 | try: | |
881 | wlock = self.wlock() |
|
881 | wlock = self.wlock() | |
882 | lock = self.lock() |
|
882 | lock = self.lock() | |
883 | if self.svfs.exists("undo"): |
|
883 | if self.svfs.exists("undo"): | |
884 | return self._rollback(dryrun, force) |
|
884 | return self._rollback(dryrun, force) | |
885 | else: |
|
885 | else: | |
886 | self.ui.warn(_("no rollback information available\n")) |
|
886 | self.ui.warn(_("no rollback information available\n")) | |
887 | return 1 |
|
887 | return 1 | |
888 | finally: |
|
888 | finally: | |
889 | release(lock, wlock) |
|
889 | release(lock, wlock) | |
890 |
|
890 | |||
891 | @unfilteredmethod # Until we get smarter cache management |
|
891 | @unfilteredmethod # Until we get smarter cache management | |
892 | def _rollback(self, dryrun, force): |
|
892 | def _rollback(self, dryrun, force): | |
893 | ui = self.ui |
|
893 | ui = self.ui | |
894 | try: |
|
894 | try: | |
895 | args = self.opener.read('undo.desc').splitlines() |
|
895 | args = self.opener.read('undo.desc').splitlines() | |
896 | (oldlen, desc, detail) = (int(args[0]), args[1], None) |
|
896 | (oldlen, desc, detail) = (int(args[0]), args[1], None) | |
897 | if len(args) >= 3: |
|
897 | if len(args) >= 3: | |
898 | detail = args[2] |
|
898 | detail = args[2] | |
899 | oldtip = oldlen - 1 |
|
899 | oldtip = oldlen - 1 | |
900 |
|
900 | |||
901 | if detail and ui.verbose: |
|
901 | if detail and ui.verbose: | |
902 | msg = (_('repository tip rolled back to revision %s' |
|
902 | msg = (_('repository tip rolled back to revision %s' | |
903 | ' (undo %s: %s)\n') |
|
903 | ' (undo %s: %s)\n') | |
904 | % (oldtip, desc, detail)) |
|
904 | % (oldtip, desc, detail)) | |
905 | else: |
|
905 | else: | |
906 | msg = (_('repository tip rolled back to revision %s' |
|
906 | msg = (_('repository tip rolled back to revision %s' | |
907 | ' (undo %s)\n') |
|
907 | ' (undo %s)\n') | |
908 | % (oldtip, desc)) |
|
908 | % (oldtip, desc)) | |
909 | except IOError: |
|
909 | except IOError: | |
910 | msg = _('rolling back unknown transaction\n') |
|
910 | msg = _('rolling back unknown transaction\n') | |
911 | desc = None |
|
911 | desc = None | |
912 |
|
912 | |||
913 | if not force and self['.'] != self['tip'] and desc == 'commit': |
|
913 | if not force and self['.'] != self['tip'] and desc == 'commit': | |
914 | raise util.Abort( |
|
914 | raise util.Abort( | |
915 | _('rollback of last commit while not checked out ' |
|
915 | _('rollback of last commit while not checked out ' | |
916 | 'may lose data'), hint=_('use -f to force')) |
|
916 | 'may lose data'), hint=_('use -f to force')) | |
917 |
|
917 | |||
918 | ui.status(msg) |
|
918 | ui.status(msg) | |
919 | if dryrun: |
|
919 | if dryrun: | |
920 | return 0 |
|
920 | return 0 | |
921 |
|
921 | |||
922 | parents = self.dirstate.parents() |
|
922 | parents = self.dirstate.parents() | |
923 | self.destroying() |
|
923 | self.destroying() | |
924 | transaction.rollback(self.sopener, 'undo', ui.warn) |
|
924 | transaction.rollback(self.sopener, 'undo', ui.warn) | |
925 | if self.vfs.exists('undo.bookmarks'): |
|
925 | if self.vfs.exists('undo.bookmarks'): | |
926 | self.vfs.rename('undo.bookmarks', 'bookmarks') |
|
926 | self.vfs.rename('undo.bookmarks', 'bookmarks') | |
927 | if self.svfs.exists('undo.phaseroots'): |
|
927 | if self.svfs.exists('undo.phaseroots'): | |
928 | self.svfs.rename('undo.phaseroots', 'phaseroots') |
|
928 | self.svfs.rename('undo.phaseroots', 'phaseroots') | |
929 | self.invalidate() |
|
929 | self.invalidate() | |
930 |
|
930 | |||
931 | parentgone = (parents[0] not in self.changelog.nodemap or |
|
931 | parentgone = (parents[0] not in self.changelog.nodemap or | |
932 | parents[1] not in self.changelog.nodemap) |
|
932 | parents[1] not in self.changelog.nodemap) | |
933 | if parentgone: |
|
933 | if parentgone: | |
934 | self.vfs.rename('undo.dirstate', 'dirstate') |
|
934 | self.vfs.rename('undo.dirstate', 'dirstate') | |
935 | try: |
|
935 | try: | |
936 | branch = self.opener.read('undo.branch') |
|
936 | branch = self.opener.read('undo.branch') | |
937 | self.dirstate.setbranch(encoding.tolocal(branch)) |
|
937 | self.dirstate.setbranch(encoding.tolocal(branch)) | |
938 | except IOError: |
|
938 | except IOError: | |
939 | ui.warn(_('named branch could not be reset: ' |
|
939 | ui.warn(_('named branch could not be reset: ' | |
940 | 'current branch is still \'%s\'\n') |
|
940 | 'current branch is still \'%s\'\n') | |
941 | % self.dirstate.branch()) |
|
941 | % self.dirstate.branch()) | |
942 |
|
942 | |||
943 | self.dirstate.invalidate() |
|
943 | self.dirstate.invalidate() | |
944 | parents = tuple([p.rev() for p in self.parents()]) |
|
944 | parents = tuple([p.rev() for p in self.parents()]) | |
945 | if len(parents) > 1: |
|
945 | if len(parents) > 1: | |
946 | ui.status(_('working directory now based on ' |
|
946 | ui.status(_('working directory now based on ' | |
947 | 'revisions %d and %d\n') % parents) |
|
947 | 'revisions %d and %d\n') % parents) | |
948 | else: |
|
948 | else: | |
949 | ui.status(_('working directory now based on ' |
|
949 | ui.status(_('working directory now based on ' | |
950 | 'revision %d\n') % parents) |
|
950 | 'revision %d\n') % parents) | |
951 | # TODO: if we know which new heads may result from this rollback, pass |
|
951 | # TODO: if we know which new heads may result from this rollback, pass | |
952 | # them to destroy(), which will prevent the branchhead cache from being |
|
952 | # them to destroy(), which will prevent the branchhead cache from being | |
953 | # invalidated. |
|
953 | # invalidated. | |
954 | self.destroyed() |
|
954 | self.destroyed() | |
955 | return 0 |
|
955 | return 0 | |
956 |
|
956 | |||
957 | def invalidatecaches(self): |
|
957 | def invalidatecaches(self): | |
958 |
|
958 | |||
959 | if '_tagscache' in vars(self): |
|
959 | if '_tagscache' in vars(self): | |
960 | # can't use delattr on proxy |
|
960 | # can't use delattr on proxy | |
961 | del self.__dict__['_tagscache'] |
|
961 | del self.__dict__['_tagscache'] | |
962 |
|
962 | |||
963 | self.unfiltered()._branchcaches.clear() |
|
963 | self.unfiltered()._branchcaches.clear() | |
964 | self.invalidatevolatilesets() |
|
964 | self.invalidatevolatilesets() | |
965 |
|
965 | |||
966 | def invalidatevolatilesets(self): |
|
966 | def invalidatevolatilesets(self): | |
967 | self.filteredrevcache.clear() |
|
967 | self.filteredrevcache.clear() | |
968 | obsolete.clearobscaches(self) |
|
968 | obsolete.clearobscaches(self) | |
969 |
|
969 | |||
970 | def invalidatedirstate(self): |
|
970 | def invalidatedirstate(self): | |
971 | '''Invalidates the dirstate, causing the next call to dirstate |
|
971 | '''Invalidates the dirstate, causing the next call to dirstate | |
972 | to check if it was modified since the last time it was read, |
|
972 | to check if it was modified since the last time it was read, | |
973 | rereading it if it has. |
|
973 | rereading it if it has. | |
974 |
|
974 | |||
975 | This is different to dirstate.invalidate() that it doesn't always |
|
975 | This is different to dirstate.invalidate() that it doesn't always | |
976 | rereads the dirstate. Use dirstate.invalidate() if you want to |
|
976 | rereads the dirstate. Use dirstate.invalidate() if you want to | |
977 | explicitly read the dirstate again (i.e. restoring it to a previous |
|
977 | explicitly read the dirstate again (i.e. restoring it to a previous | |
978 | known good state).''' |
|
978 | known good state).''' | |
979 | if hasunfilteredcache(self, 'dirstate'): |
|
979 | if hasunfilteredcache(self, 'dirstate'): | |
980 | for k in self.dirstate._filecache: |
|
980 | for k in self.dirstate._filecache: | |
981 | try: |
|
981 | try: | |
982 | delattr(self.dirstate, k) |
|
982 | delattr(self.dirstate, k) | |
983 | except AttributeError: |
|
983 | except AttributeError: | |
984 | pass |
|
984 | pass | |
985 | delattr(self.unfiltered(), 'dirstate') |
|
985 | delattr(self.unfiltered(), 'dirstate') | |
986 |
|
986 | |||
987 | def invalidate(self): |
|
987 | def invalidate(self): | |
988 | unfiltered = self.unfiltered() # all file caches are stored unfiltered |
|
988 | unfiltered = self.unfiltered() # all file caches are stored unfiltered | |
989 | for k in self._filecache: |
|
989 | for k in self._filecache: | |
990 | # dirstate is invalidated separately in invalidatedirstate() |
|
990 | # dirstate is invalidated separately in invalidatedirstate() | |
991 | if k == 'dirstate': |
|
991 | if k == 'dirstate': | |
992 | continue |
|
992 | continue | |
993 |
|
993 | |||
994 | try: |
|
994 | try: | |
995 | delattr(unfiltered, k) |
|
995 | delattr(unfiltered, k) | |
996 | except AttributeError: |
|
996 | except AttributeError: | |
997 | pass |
|
997 | pass | |
998 | self.invalidatecaches() |
|
998 | self.invalidatecaches() | |
999 | self.store.invalidatecaches() |
|
999 | self.store.invalidatecaches() | |
1000 |
|
1000 | |||
1001 | def invalidateall(self): |
|
1001 | def invalidateall(self): | |
1002 | '''Fully invalidates both store and non-store parts, causing the |
|
1002 | '''Fully invalidates both store and non-store parts, causing the | |
1003 | subsequent operation to reread any outside changes.''' |
|
1003 | subsequent operation to reread any outside changes.''' | |
1004 | # extension should hook this to invalidate its caches |
|
1004 | # extension should hook this to invalidate its caches | |
1005 | self.invalidate() |
|
1005 | self.invalidate() | |
1006 | self.invalidatedirstate() |
|
1006 | self.invalidatedirstate() | |
1007 |
|
1007 | |||
1008 | def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc): |
|
1008 | def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc): | |
1009 | try: |
|
1009 | try: | |
1010 | l = lockmod.lock(vfs, lockname, 0, releasefn, desc=desc) |
|
1010 | l = lockmod.lock(vfs, lockname, 0, releasefn, desc=desc) | |
1011 | except error.LockHeld, inst: |
|
1011 | except error.LockHeld, inst: | |
1012 | if not wait: |
|
1012 | if not wait: | |
1013 | raise |
|
1013 | raise | |
1014 | self.ui.warn(_("waiting for lock on %s held by %r\n") % |
|
1014 | self.ui.warn(_("waiting for lock on %s held by %r\n") % | |
1015 | (desc, inst.locker)) |
|
1015 | (desc, inst.locker)) | |
1016 | # default to 600 seconds timeout |
|
1016 | # default to 600 seconds timeout | |
1017 | l = lockmod.lock(vfs, lockname, |
|
1017 | l = lockmod.lock(vfs, lockname, | |
1018 | int(self.ui.config("ui", "timeout", "600")), |
|
1018 | int(self.ui.config("ui", "timeout", "600")), | |
1019 | releasefn, desc=desc) |
|
1019 | releasefn, desc=desc) | |
1020 | self.ui.warn(_("got lock after %s seconds\n") % l.delay) |
|
1020 | self.ui.warn(_("got lock after %s seconds\n") % l.delay) | |
1021 | if acquirefn: |
|
1021 | if acquirefn: | |
1022 | acquirefn() |
|
1022 | acquirefn() | |
1023 | return l |
|
1023 | return l | |
1024 |
|
1024 | |||
1025 | def _afterlock(self, callback): |
|
1025 | def _afterlock(self, callback): | |
1026 | """add a callback to the current repository lock. |
|
1026 | """add a callback to the current repository lock. | |
1027 |
|
1027 | |||
1028 | The callback will be executed on lock release.""" |
|
1028 | The callback will be executed on lock release.""" | |
1029 | l = self._lockref and self._lockref() |
|
1029 | l = self._lockref and self._lockref() | |
1030 | if l: |
|
1030 | if l: | |
1031 | l.postrelease.append(callback) |
|
1031 | l.postrelease.append(callback) | |
1032 | else: |
|
1032 | else: | |
1033 | callback() |
|
1033 | callback() | |
1034 |
|
1034 | |||
1035 | def lock(self, wait=True): |
|
1035 | def lock(self, wait=True): | |
1036 | '''Lock the repository store (.hg/store) and return a weak reference |
|
1036 | '''Lock the repository store (.hg/store) and return a weak reference | |
1037 | to the lock. Use this before modifying the store (e.g. committing or |
|
1037 | to the lock. Use this before modifying the store (e.g. committing or | |
1038 | stripping). If you are opening a transaction, get a lock as well.)''' |
|
1038 | stripping). If you are opening a transaction, get a lock as well.)''' | |
1039 | l = self._lockref and self._lockref() |
|
1039 | l = self._lockref and self._lockref() | |
1040 | if l is not None and l.held: |
|
1040 | if l is not None and l.held: | |
1041 | l.lock() |
|
1041 | l.lock() | |
1042 | return l |
|
1042 | return l | |
1043 |
|
1043 | |||
1044 | def unlock(): |
|
1044 | def unlock(): | |
1045 | if hasunfilteredcache(self, '_phasecache'): |
|
1045 | if hasunfilteredcache(self, '_phasecache'): | |
1046 | self._phasecache.write() |
|
1046 | self._phasecache.write() | |
1047 | for k, ce in self._filecache.items(): |
|
1047 | for k, ce in self._filecache.items(): | |
1048 | if k == 'dirstate' or k not in self.__dict__: |
|
1048 | if k == 'dirstate' or k not in self.__dict__: | |
1049 | continue |
|
1049 | continue | |
1050 | ce.refresh() |
|
1050 | ce.refresh() | |
1051 |
|
1051 | |||
1052 | l = self._lock(self.svfs, "lock", wait, unlock, |
|
1052 | l = self._lock(self.svfs, "lock", wait, unlock, | |
1053 | self.invalidate, _('repository %s') % self.origroot) |
|
1053 | self.invalidate, _('repository %s') % self.origroot) | |
1054 | self._lockref = weakref.ref(l) |
|
1054 | self._lockref = weakref.ref(l) | |
1055 | return l |
|
1055 | return l | |
1056 |
|
1056 | |||
1057 | def wlock(self, wait=True): |
|
1057 | def wlock(self, wait=True): | |
1058 | '''Lock the non-store parts of the repository (everything under |
|
1058 | '''Lock the non-store parts of the repository (everything under | |
1059 | .hg except .hg/store) and return a weak reference to the lock. |
|
1059 | .hg except .hg/store) and return a weak reference to the lock. | |
1060 | Use this before modifying files in .hg.''' |
|
1060 | Use this before modifying files in .hg.''' | |
1061 | l = self._wlockref and self._wlockref() |
|
1061 | l = self._wlockref and self._wlockref() | |
1062 | if l is not None and l.held: |
|
1062 | if l is not None and l.held: | |
1063 | l.lock() |
|
1063 | l.lock() | |
1064 | return l |
|
1064 | return l | |
1065 |
|
1065 | |||
1066 | def unlock(): |
|
1066 | def unlock(): | |
1067 | self.dirstate.write() |
|
1067 | self.dirstate.write() | |
1068 | self._filecache['dirstate'].refresh() |
|
1068 | self._filecache['dirstate'].refresh() | |
1069 |
|
1069 | |||
1070 | l = self._lock(self.vfs, "wlock", wait, unlock, |
|
1070 | l = self._lock(self.vfs, "wlock", wait, unlock, | |
1071 | self.invalidatedirstate, _('working directory of %s') % |
|
1071 | self.invalidatedirstate, _('working directory of %s') % | |
1072 | self.origroot) |
|
1072 | self.origroot) | |
1073 | self._wlockref = weakref.ref(l) |
|
1073 | self._wlockref = weakref.ref(l) | |
1074 | return l |
|
1074 | return l | |
1075 |
|
1075 | |||
1076 | def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist): |
|
1076 | def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist): | |
1077 | """ |
|
1077 | """ | |
1078 | commit an individual file as part of a larger transaction |
|
1078 | commit an individual file as part of a larger transaction | |
1079 | """ |
|
1079 | """ | |
1080 |
|
1080 | |||
1081 | fname = fctx.path() |
|
1081 | fname = fctx.path() | |
1082 | text = fctx.data() |
|
1082 | text = fctx.data() | |
1083 | flog = self.file(fname) |
|
1083 | flog = self.file(fname) | |
1084 | fparent1 = manifest1.get(fname, nullid) |
|
1084 | fparent1 = manifest1.get(fname, nullid) | |
1085 | fparent2 = fparent2o = manifest2.get(fname, nullid) |
|
1085 | fparent2 = fparent2o = manifest2.get(fname, nullid) | |
1086 |
|
1086 | |||
1087 | meta = {} |
|
1087 | meta = {} | |
1088 | copy = fctx.renamed() |
|
1088 | copy = fctx.renamed() | |
1089 | if copy and copy[0] != fname: |
|
1089 | if copy and copy[0] != fname: | |
1090 | # Mark the new revision of this file as a copy of another |
|
1090 | # Mark the new revision of this file as a copy of another | |
1091 | # file. This copy data will effectively act as a parent |
|
1091 | # file. This copy data will effectively act as a parent | |
1092 | # of this new revision. If this is a merge, the first |
|
1092 | # of this new revision. If this is a merge, the first | |
1093 | # parent will be the nullid (meaning "look up the copy data") |
|
1093 | # parent will be the nullid (meaning "look up the copy data") | |
1094 | # and the second one will be the other parent. For example: |
|
1094 | # and the second one will be the other parent. For example: | |
1095 | # |
|
1095 | # | |
1096 | # 0 --- 1 --- 3 rev1 changes file foo |
|
1096 | # 0 --- 1 --- 3 rev1 changes file foo | |
1097 | # \ / rev2 renames foo to bar and changes it |
|
1097 | # \ / rev2 renames foo to bar and changes it | |
1098 | # \- 2 -/ rev3 should have bar with all changes and |
|
1098 | # \- 2 -/ rev3 should have bar with all changes and | |
1099 | # should record that bar descends from |
|
1099 | # should record that bar descends from | |
1100 | # bar in rev2 and foo in rev1 |
|
1100 | # bar in rev2 and foo in rev1 | |
1101 | # |
|
1101 | # | |
1102 | # this allows this merge to succeed: |
|
1102 | # this allows this merge to succeed: | |
1103 | # |
|
1103 | # | |
1104 | # 0 --- 1 --- 3 rev4 reverts the content change from rev2 |
|
1104 | # 0 --- 1 --- 3 rev4 reverts the content change from rev2 | |
1105 | # \ / merging rev3 and rev4 should use bar@rev2 |
|
1105 | # \ / merging rev3 and rev4 should use bar@rev2 | |
1106 | # \- 2 --- 4 as the merge base |
|
1106 | # \- 2 --- 4 as the merge base | |
1107 | # |
|
1107 | # | |
1108 |
|
1108 | |||
1109 | cfname = copy[0] |
|
1109 | cfname = copy[0] | |
1110 | crev = manifest1.get(cfname) |
|
1110 | crev = manifest1.get(cfname) | |
1111 | newfparent = fparent2 |
|
1111 | newfparent = fparent2 | |
1112 |
|
1112 | |||
1113 | if manifest2: # branch merge |
|
1113 | if manifest2: # branch merge | |
1114 | if fparent2 == nullid or crev is None: # copied on remote side |
|
1114 | if fparent2 == nullid or crev is None: # copied on remote side | |
1115 | if cfname in manifest2: |
|
1115 | if cfname in manifest2: | |
1116 | crev = manifest2[cfname] |
|
1116 | crev = manifest2[cfname] | |
1117 | newfparent = fparent1 |
|
1117 | newfparent = fparent1 | |
1118 |
|
1118 | |||
1119 | # find source in nearest ancestor if we've lost track |
|
1119 | # find source in nearest ancestor if we've lost track | |
1120 | if not crev: |
|
1120 | if not crev: | |
1121 | self.ui.debug(" %s: searching for copy revision for %s\n" % |
|
1121 | self.ui.debug(" %s: searching for copy revision for %s\n" % | |
1122 | (fname, cfname)) |
|
1122 | (fname, cfname)) | |
1123 | for ancestor in self[None].ancestors(): |
|
1123 | for ancestor in self[None].ancestors(): | |
1124 | if cfname in ancestor: |
|
1124 | if cfname in ancestor: | |
1125 | crev = ancestor[cfname].filenode() |
|
1125 | crev = ancestor[cfname].filenode() | |
1126 | break |
|
1126 | break | |
1127 |
|
1127 | |||
1128 | if crev: |
|
1128 | if crev: | |
1129 | self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev))) |
|
1129 | self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev))) | |
1130 | meta["copy"] = cfname |
|
1130 | meta["copy"] = cfname | |
1131 | meta["copyrev"] = hex(crev) |
|
1131 | meta["copyrev"] = hex(crev) | |
1132 | fparent1, fparent2 = nullid, newfparent |
|
1132 | fparent1, fparent2 = nullid, newfparent | |
1133 | else: |
|
1133 | else: | |
1134 | self.ui.warn(_("warning: can't find ancestor for '%s' " |
|
1134 | self.ui.warn(_("warning: can't find ancestor for '%s' " | |
1135 | "copied from '%s'!\n") % (fname, cfname)) |
|
1135 | "copied from '%s'!\n") % (fname, cfname)) | |
1136 |
|
1136 | |||
1137 | elif fparent1 == nullid: |
|
1137 | elif fparent1 == nullid: | |
1138 | fparent1, fparent2 = fparent2, nullid |
|
1138 | fparent1, fparent2 = fparent2, nullid | |
1139 | elif fparent2 != nullid: |
|
1139 | elif fparent2 != nullid: | |
1140 | # is one parent an ancestor of the other? |
|
1140 | # is one parent an ancestor of the other? | |
1141 | fparentancestor = flog.ancestor(fparent1, fparent2) |
|
1141 | fparentancestor = flog.ancestor(fparent1, fparent2) | |
1142 | if fparentancestor == fparent1: |
|
1142 | if fparentancestor == fparent1: | |
1143 | fparent1, fparent2 = fparent2, nullid |
|
1143 | fparent1, fparent2 = fparent2, nullid | |
1144 | elif fparentancestor == fparent2: |
|
1144 | elif fparentancestor == fparent2: | |
1145 | fparent2 = nullid |
|
1145 | fparent2 = nullid | |
1146 |
|
1146 | |||
1147 | # is the file changed? |
|
1147 | # is the file changed? | |
1148 | if fparent2 != nullid or flog.cmp(fparent1, text) or meta: |
|
1148 | if fparent2 != nullid or flog.cmp(fparent1, text) or meta: | |
1149 | changelist.append(fname) |
|
1149 | changelist.append(fname) | |
1150 | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
|
1150 | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) | |
1151 |
|
1151 | |||
1152 | # are just the flags changed during merge? |
|
1152 | # are just the flags changed during merge? | |
1153 | if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): |
|
1153 | if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): | |
1154 | changelist.append(fname) |
|
1154 | changelist.append(fname) | |
1155 |
|
1155 | |||
1156 | return fparent1 |
|
1156 | return fparent1 | |
1157 |
|
1157 | |||
1158 | @unfilteredmethod |
|
1158 | @unfilteredmethod | |
1159 | def commit(self, text="", user=None, date=None, match=None, force=False, |
|
1159 | def commit(self, text="", user=None, date=None, match=None, force=False, | |
1160 | editor=False, extra={}): |
|
1160 | editor=False, extra={}): | |
1161 | """Add a new revision to current repository. |
|
1161 | """Add a new revision to current repository. | |
1162 |
|
1162 | |||
1163 | Revision information is gathered from the working directory, |
|
1163 | Revision information is gathered from the working directory, | |
1164 | match can be used to filter the committed files. If editor is |
|
1164 | match can be used to filter the committed files. If editor is | |
1165 | supplied, it is called to get a commit message. |
|
1165 | supplied, it is called to get a commit message. | |
1166 | """ |
|
1166 | """ | |
1167 |
|
1167 | |||
1168 | def fail(f, msg): |
|
1168 | def fail(f, msg): | |
1169 | raise util.Abort('%s: %s' % (f, msg)) |
|
1169 | raise util.Abort('%s: %s' % (f, msg)) | |
1170 |
|
1170 | |||
1171 | if not match: |
|
1171 | if not match: | |
1172 | match = matchmod.always(self.root, '') |
|
1172 | match = matchmod.always(self.root, '') | |
1173 |
|
1173 | |||
1174 | if not force: |
|
1174 | if not force: | |
1175 | vdirs = [] |
|
1175 | vdirs = [] | |
1176 | match.explicitdir = vdirs.append |
|
1176 | match.explicitdir = vdirs.append | |
1177 | match.bad = fail |
|
1177 | match.bad = fail | |
1178 |
|
1178 | |||
1179 | wlock = self.wlock() |
|
1179 | wlock = self.wlock() | |
1180 | try: |
|
1180 | try: | |
1181 | wctx = self[None] |
|
1181 | wctx = self[None] | |
1182 | merge = len(wctx.parents()) > 1 |
|
1182 | merge = len(wctx.parents()) > 1 | |
1183 |
|
1183 | |||
1184 | if (not force and merge and match and |
|
1184 | if (not force and merge and match and | |
1185 | (match.files() or match.anypats())): |
|
1185 | (match.files() or match.anypats())): | |
1186 | raise util.Abort(_('cannot partially commit a merge ' |
|
1186 | raise util.Abort(_('cannot partially commit a merge ' | |
1187 | '(do not specify files or patterns)')) |
|
1187 | '(do not specify files or patterns)')) | |
1188 |
|
1188 | |||
1189 | changes = self.status(match=match, clean=force) |
|
1189 | changes = self.status(match=match, clean=force) | |
1190 | if force: |
|
1190 | if force: | |
1191 | changes[0].extend(changes[6]) # mq may commit unchanged files |
|
1191 | changes[0].extend(changes[6]) # mq may commit unchanged files | |
1192 |
|
1192 | |||
1193 | # check subrepos |
|
1193 | # check subrepos | |
1194 | subs = [] |
|
1194 | subs = [] | |
1195 | commitsubs = set() |
|
1195 | commitsubs = set() | |
1196 | newstate = wctx.substate.copy() |
|
1196 | newstate = wctx.substate.copy() | |
1197 | # only manage subrepos and .hgsubstate if .hgsub is present |
|
1197 | # only manage subrepos and .hgsubstate if .hgsub is present | |
1198 | if '.hgsub' in wctx: |
|
1198 | if '.hgsub' in wctx: | |
1199 | # we'll decide whether to track this ourselves, thanks |
|
1199 | # we'll decide whether to track this ourselves, thanks | |
1200 | for c in changes[:3]: |
|
1200 | for c in changes[:3]: | |
1201 | if '.hgsubstate' in c: |
|
1201 | if '.hgsubstate' in c: | |
1202 | c.remove('.hgsubstate') |
|
1202 | c.remove('.hgsubstate') | |
1203 |
|
1203 | |||
1204 | # compare current state to last committed state |
|
1204 | # compare current state to last committed state | |
1205 | # build new substate based on last committed state |
|
1205 | # build new substate based on last committed state | |
1206 | oldstate = wctx.p1().substate |
|
1206 | oldstate = wctx.p1().substate | |
1207 | for s in sorted(newstate.keys()): |
|
1207 | for s in sorted(newstate.keys()): | |
1208 | if not match(s): |
|
1208 | if not match(s): | |
1209 | # ignore working copy, use old state if present |
|
1209 | # ignore working copy, use old state if present | |
1210 | if s in oldstate: |
|
1210 | if s in oldstate: | |
1211 | newstate[s] = oldstate[s] |
|
1211 | newstate[s] = oldstate[s] | |
1212 | continue |
|
1212 | continue | |
1213 | if not force: |
|
1213 | if not force: | |
1214 | raise util.Abort( |
|
1214 | raise util.Abort( | |
1215 | _("commit with new subrepo %s excluded") % s) |
|
1215 | _("commit with new subrepo %s excluded") % s) | |
1216 | if wctx.sub(s).dirty(True): |
|
1216 | if wctx.sub(s).dirty(True): | |
1217 | if not self.ui.configbool('ui', 'commitsubrepos'): |
|
1217 | if not self.ui.configbool('ui', 'commitsubrepos'): | |
1218 | raise util.Abort( |
|
1218 | raise util.Abort( | |
1219 | _("uncommitted changes in subrepo %s") % s, |
|
1219 | _("uncommitted changes in subrepo %s") % s, | |
1220 | hint=_("use --subrepos for recursive commit")) |
|
1220 | hint=_("use --subrepos for recursive commit")) | |
1221 | subs.append(s) |
|
1221 | subs.append(s) | |
1222 | commitsubs.add(s) |
|
1222 | commitsubs.add(s) | |
1223 | else: |
|
1223 | else: | |
1224 | bs = wctx.sub(s).basestate() |
|
1224 | bs = wctx.sub(s).basestate() | |
1225 | newstate[s] = (newstate[s][0], bs, newstate[s][2]) |
|
1225 | newstate[s] = (newstate[s][0], bs, newstate[s][2]) | |
1226 | if oldstate.get(s, (None, None, None))[1] != bs: |
|
1226 | if oldstate.get(s, (None, None, None))[1] != bs: | |
1227 | subs.append(s) |
|
1227 | subs.append(s) | |
1228 |
|
1228 | |||
1229 | # check for removed subrepos |
|
1229 | # check for removed subrepos | |
1230 | for p in wctx.parents(): |
|
1230 | for p in wctx.parents(): | |
1231 | r = [s for s in p.substate if s not in newstate] |
|
1231 | r = [s for s in p.substate if s not in newstate] | |
1232 | subs += [s for s in r if match(s)] |
|
1232 | subs += [s for s in r if match(s)] | |
1233 | if subs: |
|
1233 | if subs: | |
1234 | if (not match('.hgsub') and |
|
1234 | if (not match('.hgsub') and | |
1235 | '.hgsub' in (wctx.modified() + wctx.added())): |
|
1235 | '.hgsub' in (wctx.modified() + wctx.added())): | |
1236 | raise util.Abort( |
|
1236 | raise util.Abort( | |
1237 | _("can't commit subrepos without .hgsub")) |
|
1237 | _("can't commit subrepos without .hgsub")) | |
1238 | changes[0].insert(0, '.hgsubstate') |
|
1238 | changes[0].insert(0, '.hgsubstate') | |
1239 |
|
1239 | |||
1240 | elif '.hgsub' in changes[2]: |
|
1240 | elif '.hgsub' in changes[2]: | |
1241 | # clean up .hgsubstate when .hgsub is removed |
|
1241 | # clean up .hgsubstate when .hgsub is removed | |
1242 | if ('.hgsubstate' in wctx and |
|
1242 | if ('.hgsubstate' in wctx and | |
1243 | '.hgsubstate' not in changes[0] + changes[1] + changes[2]): |
|
1243 | '.hgsubstate' not in changes[0] + changes[1] + changes[2]): | |
1244 | changes[2].insert(0, '.hgsubstate') |
|
1244 | changes[2].insert(0, '.hgsubstate') | |
1245 |
|
1245 | |||
1246 | # make sure all explicit patterns are matched |
|
1246 | # make sure all explicit patterns are matched | |
1247 | if not force and match.files(): |
|
1247 | if not force and match.files(): | |
1248 | matched = set(changes[0] + changes[1] + changes[2]) |
|
1248 | matched = set(changes[0] + changes[1] + changes[2]) | |
1249 |
|
1249 | |||
1250 | for f in match.files(): |
|
1250 | for f in match.files(): | |
1251 | f = self.dirstate.normalize(f) |
|
1251 | f = self.dirstate.normalize(f) | |
1252 | if f == '.' or f in matched or f in wctx.substate: |
|
1252 | if f == '.' or f in matched or f in wctx.substate: | |
1253 | continue |
|
1253 | continue | |
1254 | if f in changes[3]: # missing |
|
1254 | if f in changes[3]: # missing | |
1255 | fail(f, _('file not found!')) |
|
1255 | fail(f, _('file not found!')) | |
1256 | if f in vdirs: # visited directory |
|
1256 | if f in vdirs: # visited directory | |
1257 | d = f + '/' |
|
1257 | d = f + '/' | |
1258 | for mf in matched: |
|
1258 | for mf in matched: | |
1259 | if mf.startswith(d): |
|
1259 | if mf.startswith(d): | |
1260 | break |
|
1260 | break | |
1261 | else: |
|
1261 | else: | |
1262 | fail(f, _("no match under directory!")) |
|
1262 | fail(f, _("no match under directory!")) | |
1263 | elif f not in self.dirstate: |
|
1263 | elif f not in self.dirstate: | |
1264 | fail(f, _("file not tracked!")) |
|
1264 | fail(f, _("file not tracked!")) | |
1265 |
|
1265 | |||
1266 | cctx = context.workingctx(self, text, user, date, extra, changes) |
|
1266 | cctx = context.workingctx(self, text, user, date, extra, changes) | |
1267 |
|
1267 | |||
1268 | if (not force and not extra.get("close") and not merge |
|
1268 | if (not force and not extra.get("close") and not merge | |
1269 | and not cctx.files() |
|
1269 | and not cctx.files() | |
1270 | and wctx.branch() == wctx.p1().branch()): |
|
1270 | and wctx.branch() == wctx.p1().branch()): | |
1271 | return None |
|
1271 | return None | |
1272 |
|
1272 | |||
1273 | if merge and cctx.deleted(): |
|
1273 | if merge and cctx.deleted(): | |
1274 | raise util.Abort(_("cannot commit merge with missing files")) |
|
1274 | raise util.Abort(_("cannot commit merge with missing files")) | |
1275 |
|
1275 | |||
1276 | ms = mergemod.mergestate(self) |
|
1276 | ms = mergemod.mergestate(self) | |
1277 | for f in changes[0]: |
|
1277 | for f in changes[0]: | |
1278 | if f in ms and ms[f] == 'u': |
|
1278 | if f in ms and ms[f] == 'u': | |
1279 | raise util.Abort(_("unresolved merge conflicts " |
|
1279 | raise util.Abort(_("unresolved merge conflicts " | |
1280 | "(see hg help resolve)")) |
|
1280 | "(see hg help resolve)")) | |
1281 |
|
1281 | |||
1282 | if editor: |
|
1282 | if editor: | |
1283 | cctx._text = editor(self, cctx, subs) |
|
1283 | cctx._text = editor(self, cctx, subs) | |
1284 | edited = (text != cctx._text) |
|
1284 | edited = (text != cctx._text) | |
1285 |
|
1285 | |||
1286 | # Save commit message in case this transaction gets rolled back |
|
1286 | # Save commit message in case this transaction gets rolled back | |
1287 | # (e.g. by a pretxncommit hook). Leave the content alone on |
|
1287 | # (e.g. by a pretxncommit hook). Leave the content alone on | |
1288 | # the assumption that the user will use the same editor again. |
|
1288 | # the assumption that the user will use the same editor again. | |
1289 | msgfn = self.savecommitmessage(cctx._text) |
|
1289 | msgfn = self.savecommitmessage(cctx._text) | |
1290 |
|
1290 | |||
1291 | # commit subs and write new state |
|
1291 | # commit subs and write new state | |
1292 | if subs: |
|
1292 | if subs: | |
1293 | for s in sorted(commitsubs): |
|
1293 | for s in sorted(commitsubs): | |
1294 | sub = wctx.sub(s) |
|
1294 | sub = wctx.sub(s) | |
1295 | self.ui.status(_('committing subrepository %s\n') % |
|
1295 | self.ui.status(_('committing subrepository %s\n') % | |
1296 | subrepo.subrelpath(sub)) |
|
1296 | subrepo.subrelpath(sub)) | |
1297 | sr = sub.commit(cctx._text, user, date) |
|
1297 | sr = sub.commit(cctx._text, user, date) | |
1298 | newstate[s] = (newstate[s][0], sr) |
|
1298 | newstate[s] = (newstate[s][0], sr) | |
1299 | subrepo.writestate(self, newstate) |
|
1299 | subrepo.writestate(self, newstate) | |
1300 |
|
1300 | |||
1301 | p1, p2 = self.dirstate.parents() |
|
1301 | p1, p2 = self.dirstate.parents() | |
1302 | hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '') |
|
1302 | hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '') | |
1303 | try: |
|
1303 | try: | |
1304 | self.hook("precommit", throw=True, parent1=hookp1, |
|
1304 | self.hook("precommit", throw=True, parent1=hookp1, | |
1305 | parent2=hookp2) |
|
1305 | parent2=hookp2) | |
1306 | ret = self.commitctx(cctx, True) |
|
1306 | ret = self.commitctx(cctx, True) | |
1307 | except: # re-raises |
|
1307 | except: # re-raises | |
1308 | if edited: |
|
1308 | if edited: | |
1309 | self.ui.write( |
|
1309 | self.ui.write( | |
1310 | _('note: commit message saved in %s\n') % msgfn) |
|
1310 | _('note: commit message saved in %s\n') % msgfn) | |
1311 | raise |
|
1311 | raise | |
1312 |
|
1312 | |||
1313 | # update bookmarks, dirstate and mergestate |
|
1313 | # update bookmarks, dirstate and mergestate | |
1314 | bookmarks.update(self, [p1, p2], ret) |
|
1314 | bookmarks.update(self, [p1, p2], ret) | |
1315 | cctx.markcommitted(ret) |
|
1315 | cctx.markcommitted(ret) | |
1316 | ms.reset() |
|
1316 | ms.reset() | |
1317 | finally: |
|
1317 | finally: | |
1318 | wlock.release() |
|
1318 | wlock.release() | |
1319 |
|
1319 | |||
1320 | def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2): |
|
1320 | def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2): | |
1321 | self.hook("commit", node=node, parent1=parent1, parent2=parent2) |
|
1321 | self.hook("commit", node=node, parent1=parent1, parent2=parent2) | |
1322 | self._afterlock(commithook) |
|
1322 | self._afterlock(commithook) | |
1323 | return ret |
|
1323 | return ret | |
1324 |
|
1324 | |||
1325 | @unfilteredmethod |
|
1325 | @unfilteredmethod | |
1326 | def commitctx(self, ctx, error=False): |
|
1326 | def commitctx(self, ctx, error=False): | |
1327 | """Add a new revision to current repository. |
|
1327 | """Add a new revision to current repository. | |
1328 | Revision information is passed via the context argument. |
|
1328 | Revision information is passed via the context argument. | |
1329 | """ |
|
1329 | """ | |
1330 |
|
1330 | |||
1331 | tr = lock = None |
|
1331 | tr = lock = None | |
1332 | removed = list(ctx.removed()) |
|
1332 | removed = list(ctx.removed()) | |
1333 | p1, p2 = ctx.p1(), ctx.p2() |
|
1333 | p1, p2 = ctx.p1(), ctx.p2() | |
1334 | user = ctx.user() |
|
1334 | user = ctx.user() | |
1335 |
|
1335 | |||
1336 | lock = self.lock() |
|
1336 | lock = self.lock() | |
1337 | try: |
|
1337 | try: | |
1338 | tr = self.transaction("commit") |
|
1338 | tr = self.transaction("commit") | |
1339 | trp = weakref.proxy(tr) |
|
1339 | trp = weakref.proxy(tr) | |
1340 |
|
1340 | |||
1341 | if ctx.files(): |
|
1341 | if ctx.files(): | |
1342 | m1 = p1.manifest().copy() |
|
1342 | m1 = p1.manifest().copy() | |
1343 | m2 = p2.manifest() |
|
1343 | m2 = p2.manifest() | |
1344 |
|
1344 | |||
1345 | # check in files |
|
1345 | # check in files | |
1346 | new = {} |
|
1346 | new = {} | |
1347 | changed = [] |
|
1347 | changed = [] | |
1348 | linkrev = len(self) |
|
1348 | linkrev = len(self) | |
1349 | for f in sorted(ctx.modified() + ctx.added()): |
|
1349 | for f in sorted(ctx.modified() + ctx.added()): | |
1350 | self.ui.note(f + "\n") |
|
1350 | self.ui.note(f + "\n") | |
1351 | try: |
|
1351 | try: | |
1352 | fctx = ctx[f] |
|
1352 | fctx = ctx[f] | |
1353 | new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, |
|
1353 | new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, | |
1354 | changed) |
|
1354 | changed) | |
1355 | m1.set(f, fctx.flags()) |
|
1355 | m1.set(f, fctx.flags()) | |
1356 | except OSError, inst: |
|
1356 | except OSError, inst: | |
1357 | self.ui.warn(_("trouble committing %s!\n") % f) |
|
1357 | self.ui.warn(_("trouble committing %s!\n") % f) | |
1358 | raise |
|
1358 | raise | |
1359 | except IOError, inst: |
|
1359 | except IOError, inst: | |
1360 | errcode = getattr(inst, 'errno', errno.ENOENT) |
|
1360 | errcode = getattr(inst, 'errno', errno.ENOENT) | |
1361 | if error or errcode and errcode != errno.ENOENT: |
|
1361 | if error or errcode and errcode != errno.ENOENT: | |
1362 | self.ui.warn(_("trouble committing %s!\n") % f) |
|
1362 | self.ui.warn(_("trouble committing %s!\n") % f) | |
1363 | raise |
|
1363 | raise | |
1364 | else: |
|
1364 | else: | |
1365 | removed.append(f) |
|
1365 | removed.append(f) | |
1366 |
|
1366 | |||
1367 | # update manifest |
|
1367 | # update manifest | |
1368 | m1.update(new) |
|
1368 | m1.update(new) | |
1369 | removed = [f for f in sorted(removed) if f in m1 or f in m2] |
|
1369 | removed = [f for f in sorted(removed) if f in m1 or f in m2] | |
1370 | drop = [f for f in removed if f in m1] |
|
1370 | drop = [f for f in removed if f in m1] | |
1371 | for f in drop: |
|
1371 | for f in drop: | |
1372 | del m1[f] |
|
1372 | del m1[f] | |
1373 | mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(), |
|
1373 | mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(), | |
1374 | p2.manifestnode(), (new, drop)) |
|
1374 | p2.manifestnode(), (new, drop)) | |
1375 | files = changed + removed |
|
1375 | files = changed + removed | |
1376 | else: |
|
1376 | else: | |
1377 | mn = p1.manifestnode() |
|
1377 | mn = p1.manifestnode() | |
1378 | files = [] |
|
1378 | files = [] | |
1379 |
|
1379 | |||
1380 | # update changelog |
|
1380 | # update changelog | |
1381 | self.changelog.delayupdate() |
|
1381 | self.changelog.delayupdate() | |
1382 | n = self.changelog.add(mn, files, ctx.description(), |
|
1382 | n = self.changelog.add(mn, files, ctx.description(), | |
1383 | trp, p1.node(), p2.node(), |
|
1383 | trp, p1.node(), p2.node(), | |
1384 | user, ctx.date(), ctx.extra().copy()) |
|
1384 | user, ctx.date(), ctx.extra().copy()) | |
1385 | p = lambda: self.changelog.writepending() and self.root or "" |
|
1385 | p = lambda: self.changelog.writepending() and self.root or "" | |
1386 | xp1, xp2 = p1.hex(), p2 and p2.hex() or '' |
|
1386 | xp1, xp2 = p1.hex(), p2 and p2.hex() or '' | |
1387 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
|
1387 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, | |
1388 | parent2=xp2, pending=p) |
|
1388 | parent2=xp2, pending=p) | |
1389 | self.changelog.finalize(trp) |
|
1389 | self.changelog.finalize(trp) | |
1390 | # set the new commit is proper phase |
|
1390 | # set the new commit is proper phase | |
1391 | targetphase = subrepo.newcommitphase(self.ui, ctx) |
|
1391 | targetphase = subrepo.newcommitphase(self.ui, ctx) | |
1392 | if targetphase: |
|
1392 | if targetphase: | |
1393 | # retract boundary do not alter parent changeset. |
|
1393 | # retract boundary do not alter parent changeset. | |
1394 | # if a parent have higher the resulting phase will |
|
1394 | # if a parent have higher the resulting phase will | |
1395 | # be compliant anyway |
|
1395 | # be compliant anyway | |
1396 | # |
|
1396 | # | |
1397 | # if minimal phase was 0 we don't need to retract anything |
|
1397 | # if minimal phase was 0 we don't need to retract anything | |
1398 | phases.retractboundary(self, targetphase, [n]) |
|
1398 | phases.retractboundary(self, targetphase, [n]) | |
1399 | tr.close() |
|
1399 | tr.close() | |
1400 | branchmap.updatecache(self.filtered('served')) |
|
1400 | branchmap.updatecache(self.filtered('served')) | |
1401 | return n |
|
1401 | return n | |
1402 | finally: |
|
1402 | finally: | |
1403 | if tr: |
|
1403 | if tr: | |
1404 | tr.release() |
|
1404 | tr.release() | |
1405 | lock.release() |
|
1405 | lock.release() | |
1406 |
|
1406 | |||
1407 | @unfilteredmethod |
|
1407 | @unfilteredmethod | |
1408 | def destroying(self): |
|
1408 | def destroying(self): | |
1409 | '''Inform the repository that nodes are about to be destroyed. |
|
1409 | '''Inform the repository that nodes are about to be destroyed. | |
1410 | Intended for use by strip and rollback, so there's a common |
|
1410 | Intended for use by strip and rollback, so there's a common | |
1411 | place for anything that has to be done before destroying history. |
|
1411 | place for anything that has to be done before destroying history. | |
1412 |
|
1412 | |||
1413 | This is mostly useful for saving state that is in memory and waiting |
|
1413 | This is mostly useful for saving state that is in memory and waiting | |
1414 | to be flushed when the current lock is released. Because a call to |
|
1414 | to be flushed when the current lock is released. Because a call to | |
1415 | destroyed is imminent, the repo will be invalidated causing those |
|
1415 | destroyed is imminent, the repo will be invalidated causing those | |
1416 | changes to stay in memory (waiting for the next unlock), or vanish |
|
1416 | changes to stay in memory (waiting for the next unlock), or vanish | |
1417 | completely. |
|
1417 | completely. | |
1418 | ''' |
|
1418 | ''' | |
1419 | # When using the same lock to commit and strip, the phasecache is left |
|
1419 | # When using the same lock to commit and strip, the phasecache is left | |
1420 | # dirty after committing. Then when we strip, the repo is invalidated, |
|
1420 | # dirty after committing. Then when we strip, the repo is invalidated, | |
1421 | # causing those changes to disappear. |
|
1421 | # causing those changes to disappear. | |
1422 | if '_phasecache' in vars(self): |
|
1422 | if '_phasecache' in vars(self): | |
1423 | self._phasecache.write() |
|
1423 | self._phasecache.write() | |
1424 |
|
1424 | |||
1425 | @unfilteredmethod |
|
1425 | @unfilteredmethod | |
1426 | def destroyed(self): |
|
1426 | def destroyed(self): | |
1427 | '''Inform the repository that nodes have been destroyed. |
|
1427 | '''Inform the repository that nodes have been destroyed. | |
1428 | Intended for use by strip and rollback, so there's a common |
|
1428 | Intended for use by strip and rollback, so there's a common | |
1429 | place for anything that has to be done after destroying history. |
|
1429 | place for anything that has to be done after destroying history. | |
1430 | ''' |
|
1430 | ''' | |
1431 | # When one tries to: |
|
1431 | # When one tries to: | |
1432 | # 1) destroy nodes thus calling this method (e.g. strip) |
|
1432 | # 1) destroy nodes thus calling this method (e.g. strip) | |
1433 | # 2) use phasecache somewhere (e.g. commit) |
|
1433 | # 2) use phasecache somewhere (e.g. commit) | |
1434 | # |
|
1434 | # | |
1435 | # then 2) will fail because the phasecache contains nodes that were |
|
1435 | # then 2) will fail because the phasecache contains nodes that were | |
1436 | # removed. We can either remove phasecache from the filecache, |
|
1436 | # removed. We can either remove phasecache from the filecache, | |
1437 | # causing it to reload next time it is accessed, or simply filter |
|
1437 | # causing it to reload next time it is accessed, or simply filter | |
1438 | # the removed nodes now and write the updated cache. |
|
1438 | # the removed nodes now and write the updated cache. | |
1439 | self._phasecache.filterunknown(self) |
|
1439 | self._phasecache.filterunknown(self) | |
1440 | self._phasecache.write() |
|
1440 | self._phasecache.write() | |
1441 |
|
1441 | |||
1442 | # update the 'served' branch cache to help read only server process |
|
1442 | # update the 'served' branch cache to help read only server process | |
1443 | # Thanks to branchcache collaboration this is done from the nearest |
|
1443 | # Thanks to branchcache collaboration this is done from the nearest | |
1444 | # filtered subset and it is expected to be fast. |
|
1444 | # filtered subset and it is expected to be fast. | |
1445 | branchmap.updatecache(self.filtered('served')) |
|
1445 | branchmap.updatecache(self.filtered('served')) | |
1446 |
|
1446 | |||
1447 | # Ensure the persistent tag cache is updated. Doing it now |
|
1447 | # Ensure the persistent tag cache is updated. Doing it now | |
1448 | # means that the tag cache only has to worry about destroyed |
|
1448 | # means that the tag cache only has to worry about destroyed | |
1449 | # heads immediately after a strip/rollback. That in turn |
|
1449 | # heads immediately after a strip/rollback. That in turn | |
1450 | # guarantees that "cachetip == currenttip" (comparing both rev |
|
1450 | # guarantees that "cachetip == currenttip" (comparing both rev | |
1451 | # and node) always means no nodes have been added or destroyed. |
|
1451 | # and node) always means no nodes have been added or destroyed. | |
1452 |
|
1452 | |||
1453 | # XXX this is suboptimal when qrefresh'ing: we strip the current |
|
1453 | # XXX this is suboptimal when qrefresh'ing: we strip the current | |
1454 | # head, refresh the tag cache, then immediately add a new head. |
|
1454 | # head, refresh the tag cache, then immediately add a new head. | |
1455 | # But I think doing it this way is necessary for the "instant |
|
1455 | # But I think doing it this way is necessary for the "instant | |
1456 | # tag cache retrieval" case to work. |
|
1456 | # tag cache retrieval" case to work. | |
1457 | self.invalidate() |
|
1457 | self.invalidate() | |
1458 |
|
1458 | |||
1459 | def walk(self, match, node=None): |
|
1459 | def walk(self, match, node=None): | |
1460 | ''' |
|
1460 | ''' | |
1461 | walk recursively through the directory tree or a given |
|
1461 | walk recursively through the directory tree or a given | |
1462 | changeset, finding all files matched by the match |
|
1462 | changeset, finding all files matched by the match | |
1463 | function |
|
1463 | function | |
1464 | ''' |
|
1464 | ''' | |
1465 | return self[node].walk(match) |
|
1465 | return self[node].walk(match) | |
1466 |
|
1466 | |||
1467 | def status(self, node1='.', node2=None, match=None, |
|
1467 | def status(self, node1='.', node2=None, match=None, | |
1468 | ignored=False, clean=False, unknown=False, |
|
1468 | ignored=False, clean=False, unknown=False, | |
1469 | listsubrepos=False): |
|
1469 | listsubrepos=False): | |
1470 | """return status of files between two nodes or node and working |
|
1470 | """return status of files between two nodes or node and working | |
1471 | directory. |
|
1471 | directory. | |
1472 |
|
1472 | |||
1473 | If node1 is None, use the first dirstate parent instead. |
|
1473 | If node1 is None, use the first dirstate parent instead. | |
1474 | If node2 is None, compare node1 with working directory. |
|
1474 | If node2 is None, compare node1 with working directory. | |
1475 | """ |
|
1475 | """ | |
1476 |
|
1476 | |||
1477 | def mfmatches(ctx): |
|
1477 | def mfmatches(ctx): | |
1478 | mf = ctx.manifest().copy() |
|
1478 | mf = ctx.manifest().copy() | |
1479 | if match.always(): |
|
1479 | if match.always(): | |
1480 | return mf |
|
1480 | return mf | |
1481 | for fn in mf.keys(): |
|
1481 | for fn in mf.keys(): | |
1482 | if not match(fn): |
|
1482 | if not match(fn): | |
1483 | del mf[fn] |
|
1483 | del mf[fn] | |
1484 | return mf |
|
1484 | return mf | |
1485 |
|
1485 | |||
1486 | ctx1 = self[node1] |
|
1486 | ctx1 = self[node1] | |
1487 | ctx2 = self[node2] |
|
1487 | ctx2 = self[node2] | |
1488 |
|
1488 | |||
1489 | working = ctx2.rev() is None |
|
1489 | working = ctx2.rev() is None | |
1490 | parentworking = working and ctx1 == self['.'] |
|
1490 | parentworking = working and ctx1 == self['.'] | |
1491 | match = match or matchmod.always(self.root, self.getcwd()) |
|
1491 | match = match or matchmod.always(self.root, self.getcwd()) | |
1492 | listignored, listclean, listunknown = ignored, clean, unknown |
|
1492 | listignored, listclean, listunknown = ignored, clean, unknown | |
1493 |
|
1493 | |||
1494 | # load earliest manifest first for caching reasons |
|
1494 | # load earliest manifest first for caching reasons | |
1495 | if not working and ctx2.rev() < ctx1.rev(): |
|
1495 | if not working and ctx2.rev() < ctx1.rev(): | |
1496 | ctx2.manifest() |
|
1496 | ctx2.manifest() | |
1497 |
|
1497 | |||
1498 | if not parentworking: |
|
1498 | if not parentworking: | |
1499 | def bad(f, msg): |
|
1499 | def bad(f, msg): | |
1500 | # 'f' may be a directory pattern from 'match.files()', |
|
1500 | # 'f' may be a directory pattern from 'match.files()', | |
1501 | # so 'f not in ctx1' is not enough |
|
1501 | # so 'f not in ctx1' is not enough | |
1502 | if f not in ctx1 and f not in ctx1.dirs(): |
|
1502 | if f not in ctx1 and f not in ctx1.dirs(): | |
1503 | self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) |
|
1503 | self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) | |
1504 | match.bad = bad |
|
1504 | match.bad = bad | |
1505 |
|
1505 | |||
1506 | if working: # we need to scan the working dir |
|
1506 | if working: # we need to scan the working dir | |
1507 | subrepos = [] |
|
1507 | subrepos = [] | |
1508 | if '.hgsub' in self.dirstate: |
|
1508 | if '.hgsub' in self.dirstate: | |
1509 | subrepos = sorted(ctx2.substate) |
|
1509 | subrepos = sorted(ctx2.substate) | |
1510 | s = self.dirstate.status(match, subrepos, listignored, |
|
1510 | s = self.dirstate.status(match, subrepos, listignored, | |
1511 | listclean, listunknown) |
|
1511 | listclean, listunknown) | |
1512 | cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
|
1512 | cmp, modified, added, removed, deleted, unknown, ignored, clean = s | |
1513 |
|
1513 | |||
1514 | # check for any possibly clean files |
|
1514 | # check for any possibly clean files | |
1515 | if parentworking and cmp: |
|
1515 | if parentworking and cmp: | |
1516 | fixup = [] |
|
1516 | fixup = [] | |
1517 | # do a full compare of any files that might have changed |
|
1517 | # do a full compare of any files that might have changed | |
1518 | for f in sorted(cmp): |
|
1518 | for f in sorted(cmp): | |
1519 | if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f) |
|
1519 | if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f) | |
1520 | or ctx1[f].cmp(ctx2[f])): |
|
1520 | or ctx1[f].cmp(ctx2[f])): | |
1521 | modified.append(f) |
|
1521 | modified.append(f) | |
1522 | else: |
|
1522 | else: | |
1523 | fixup.append(f) |
|
1523 | fixup.append(f) | |
1524 |
|
1524 | |||
1525 | # update dirstate for files that are actually clean |
|
1525 | # update dirstate for files that are actually clean | |
1526 | if fixup: |
|
1526 | if fixup: | |
1527 | if listclean: |
|
1527 | if listclean: | |
1528 | clean += fixup |
|
1528 | clean += fixup | |
1529 |
|
1529 | |||
1530 | try: |
|
1530 | try: | |
1531 | # updating the dirstate is optional |
|
1531 | # updating the dirstate is optional | |
1532 | # so we don't wait on the lock |
|
1532 | # so we don't wait on the lock | |
1533 | wlock = self.wlock(False) |
|
1533 | wlock = self.wlock(False) | |
1534 | try: |
|
1534 | try: | |
1535 | for f in fixup: |
|
1535 | for f in fixup: | |
1536 | self.dirstate.normal(f) |
|
1536 | self.dirstate.normal(f) | |
1537 | finally: |
|
1537 | finally: | |
1538 | wlock.release() |
|
1538 | wlock.release() | |
1539 | except error.LockError: |
|
1539 | except error.LockError: | |
1540 | pass |
|
1540 | pass | |
1541 |
|
1541 | |||
1542 | if not parentworking: |
|
1542 | if not parentworking: | |
1543 | mf1 = mfmatches(ctx1) |
|
1543 | mf1 = mfmatches(ctx1) | |
1544 | if working: |
|
1544 | if working: | |
1545 | # we are comparing working dir against non-parent |
|
1545 | # we are comparing working dir against non-parent | |
1546 | # generate a pseudo-manifest for the working dir |
|
1546 | # generate a pseudo-manifest for the working dir | |
1547 | mf2 = mfmatches(self['.']) |
|
1547 | mf2 = mfmatches(self['.']) | |
1548 | for f in cmp + modified + added: |
|
1548 | for f in cmp + modified + added: | |
1549 | mf2[f] = None |
|
1549 | mf2[f] = None | |
1550 | mf2.set(f, ctx2.flags(f)) |
|
1550 | mf2.set(f, ctx2.flags(f)) | |
1551 | for f in removed: |
|
1551 | for f in removed: | |
1552 | if f in mf2: |
|
1552 | if f in mf2: | |
1553 | del mf2[f] |
|
1553 | del mf2[f] | |
1554 | else: |
|
1554 | else: | |
1555 | # we are comparing two revisions |
|
1555 | # we are comparing two revisions | |
1556 | deleted, unknown, ignored = [], [], [] |
|
1556 | deleted, unknown, ignored = [], [], [] | |
1557 | mf2 = mfmatches(ctx2) |
|
1557 | mf2 = mfmatches(ctx2) | |
1558 |
|
1558 | |||
1559 | modified, added, clean = [], [], [] |
|
1559 | modified, added, clean = [], [], [] | |
1560 | withflags = mf1.withflags() | mf2.withflags() |
|
1560 | withflags = mf1.withflags() | mf2.withflags() | |
1561 | for fn, mf2node in mf2.iteritems(): |
|
1561 | for fn, mf2node in mf2.iteritems(): | |
1562 | if fn in mf1: |
|
1562 | if fn in mf1: | |
1563 | if (fn not in deleted and |
|
1563 | if (fn not in deleted and | |
1564 | ((fn in withflags and mf1.flags(fn) != mf2.flags(fn)) or |
|
1564 | ((fn in withflags and mf1.flags(fn) != mf2.flags(fn)) or | |
1565 | (mf1[fn] != mf2node and |
|
1565 | (mf1[fn] != mf2node and | |
1566 | (mf2node or ctx1[fn].cmp(ctx2[fn]))))): |
|
1566 | (mf2node or ctx1[fn].cmp(ctx2[fn]))))): | |
1567 | modified.append(fn) |
|
1567 | modified.append(fn) | |
1568 | elif listclean: |
|
1568 | elif listclean: | |
1569 | clean.append(fn) |
|
1569 | clean.append(fn) | |
1570 | del mf1[fn] |
|
1570 | del mf1[fn] | |
1571 | elif fn not in deleted: |
|
1571 | elif fn not in deleted: | |
1572 | added.append(fn) |
|
1572 | added.append(fn) | |
1573 | removed = mf1.keys() |
|
1573 | removed = mf1.keys() | |
1574 |
|
1574 | |||
1575 | if working and modified and not self.dirstate._checklink: |
|
1575 | if working and modified and not self.dirstate._checklink: | |
1576 | # Symlink placeholders may get non-symlink-like contents |
|
1576 | # Symlink placeholders may get non-symlink-like contents | |
1577 | # via user error or dereferencing by NFS or Samba servers, |
|
1577 | # via user error or dereferencing by NFS or Samba servers, | |
1578 | # so we filter out any placeholders that don't look like a |
|
1578 | # so we filter out any placeholders that don't look like a | |
1579 | # symlink |
|
1579 | # symlink | |
1580 | sane = [] |
|
1580 | sane = [] | |
1581 | for f in modified: |
|
1581 | for f in modified: | |
1582 | if ctx2.flags(f) == 'l': |
|
1582 | if ctx2.flags(f) == 'l': | |
1583 | d = ctx2[f].data() |
|
1583 | d = ctx2[f].data() | |
1584 | if d == '' or len(d) >= 1024 or '\n' in d or util.binary(d): |
|
1584 | if d == '' or len(d) >= 1024 or '\n' in d or util.binary(d): | |
1585 | self.ui.debug('ignoring suspect symlink placeholder' |
|
1585 | self.ui.debug('ignoring suspect symlink placeholder' | |
1586 | ' "%s"\n' % f) |
|
1586 | ' "%s"\n' % f) | |
1587 | continue |
|
1587 | continue | |
1588 | sane.append(f) |
|
1588 | sane.append(f) | |
1589 | modified = sane |
|
1589 | modified = sane | |
1590 |
|
1590 | |||
1591 | r = modified, added, removed, deleted, unknown, ignored, clean |
|
1591 | r = modified, added, removed, deleted, unknown, ignored, clean | |
1592 |
|
1592 | |||
1593 | if listsubrepos: |
|
1593 | if listsubrepos: | |
1594 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
|
1594 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): | |
1595 | if working: |
|
1595 | if working: | |
1596 | rev2 = None |
|
1596 | rev2 = None | |
1597 | else: |
|
1597 | else: | |
1598 | rev2 = ctx2.substate[subpath][1] |
|
1598 | rev2 = ctx2.substate[subpath][1] | |
1599 | try: |
|
1599 | try: | |
1600 | submatch = matchmod.narrowmatcher(subpath, match) |
|
1600 | submatch = matchmod.narrowmatcher(subpath, match) | |
1601 | s = sub.status(rev2, match=submatch, ignored=listignored, |
|
1601 | s = sub.status(rev2, match=submatch, ignored=listignored, | |
1602 | clean=listclean, unknown=listunknown, |
|
1602 | clean=listclean, unknown=listunknown, | |
1603 | listsubrepos=True) |
|
1603 | listsubrepos=True) | |
1604 | for rfiles, sfiles in zip(r, s): |
|
1604 | for rfiles, sfiles in zip(r, s): | |
1605 | rfiles.extend("%s/%s" % (subpath, f) for f in sfiles) |
|
1605 | rfiles.extend("%s/%s" % (subpath, f) for f in sfiles) | |
1606 | except error.LookupError: |
|
1606 | except error.LookupError: | |
1607 | self.ui.status(_("skipping missing subrepository: %s\n") |
|
1607 | self.ui.status(_("skipping missing subrepository: %s\n") | |
1608 | % subpath) |
|
1608 | % subpath) | |
1609 |
|
1609 | |||
1610 | for l in r: |
|
1610 | for l in r: | |
1611 | l.sort() |
|
1611 | l.sort() | |
1612 | return r |
|
1612 | return r | |
1613 |
|
1613 | |||
1614 | def heads(self, start=None): |
|
1614 | def heads(self, start=None): | |
1615 | heads = self.changelog.heads(start) |
|
1615 | heads = self.changelog.heads(start) | |
1616 | # sort the output in rev descending order |
|
1616 | # sort the output in rev descending order | |
1617 | return sorted(heads, key=self.changelog.rev, reverse=True) |
|
1617 | return sorted(heads, key=self.changelog.rev, reverse=True) | |
1618 |
|
1618 | |||
1619 | def branchheads(self, branch=None, start=None, closed=False): |
|
1619 | def branchheads(self, branch=None, start=None, closed=False): | |
1620 | '''return a (possibly filtered) list of heads for the given branch |
|
1620 | '''return a (possibly filtered) list of heads for the given branch | |
1621 |
|
1621 | |||
1622 | Heads are returned in topological order, from newest to oldest. |
|
1622 | Heads are returned in topological order, from newest to oldest. | |
1623 | If branch is None, use the dirstate branch. |
|
1623 | If branch is None, use the dirstate branch. | |
1624 | If start is not None, return only heads reachable from start. |
|
1624 | If start is not None, return only heads reachable from start. | |
1625 | If closed is True, return heads that are marked as closed as well. |
|
1625 | If closed is True, return heads that are marked as closed as well. | |
1626 | ''' |
|
1626 | ''' | |
1627 | if branch is None: |
|
1627 | if branch is None: | |
1628 | branch = self[None].branch() |
|
1628 | branch = self[None].branch() | |
1629 | branches = self.branchmap() |
|
1629 | branches = self.branchmap() | |
1630 | if branch not in branches: |
|
1630 | if branch not in branches: | |
1631 | return [] |
|
1631 | return [] | |
1632 | # the cache returns heads ordered lowest to highest |
|
1632 | # the cache returns heads ordered lowest to highest | |
1633 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) |
|
1633 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) | |
1634 | if start is not None: |
|
1634 | if start is not None: | |
1635 | # filter out the heads that cannot be reached from startrev |
|
1635 | # filter out the heads that cannot be reached from startrev | |
1636 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) |
|
1636 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) | |
1637 | bheads = [h for h in bheads if h in fbheads] |
|
1637 | bheads = [h for h in bheads if h in fbheads] | |
1638 | return bheads |
|
1638 | return bheads | |
1639 |
|
1639 | |||
1640 | def branches(self, nodes): |
|
1640 | def branches(self, nodes): | |
1641 | if not nodes: |
|
1641 | if not nodes: | |
1642 | nodes = [self.changelog.tip()] |
|
1642 | nodes = [self.changelog.tip()] | |
1643 | b = [] |
|
1643 | b = [] | |
1644 | for n in nodes: |
|
1644 | for n in nodes: | |
1645 | t = n |
|
1645 | t = n | |
1646 | while True: |
|
1646 | while True: | |
1647 | p = self.changelog.parents(n) |
|
1647 | p = self.changelog.parents(n) | |
1648 | if p[1] != nullid or p[0] == nullid: |
|
1648 | if p[1] != nullid or p[0] == nullid: | |
1649 | b.append((t, n, p[0], p[1])) |
|
1649 | b.append((t, n, p[0], p[1])) | |
1650 | break |
|
1650 | break | |
1651 | n = p[0] |
|
1651 | n = p[0] | |
1652 | return b |
|
1652 | return b | |
1653 |
|
1653 | |||
1654 | def between(self, pairs): |
|
1654 | def between(self, pairs): | |
1655 | r = [] |
|
1655 | r = [] | |
1656 |
|
1656 | |||
1657 | for top, bottom in pairs: |
|
1657 | for top, bottom in pairs: | |
1658 | n, l, i = top, [], 0 |
|
1658 | n, l, i = top, [], 0 | |
1659 | f = 1 |
|
1659 | f = 1 | |
1660 |
|
1660 | |||
1661 | while n != bottom and n != nullid: |
|
1661 | while n != bottom and n != nullid: | |
1662 | p = self.changelog.parents(n)[0] |
|
1662 | p = self.changelog.parents(n)[0] | |
1663 | if i == f: |
|
1663 | if i == f: | |
1664 | l.append(n) |
|
1664 | l.append(n) | |
1665 | f = f * 2 |
|
1665 | f = f * 2 | |
1666 | n = p |
|
1666 | n = p | |
1667 | i += 1 |
|
1667 | i += 1 | |
1668 |
|
1668 | |||
1669 | r.append(l) |
|
1669 | r.append(l) | |
1670 |
|
1670 | |||
1671 | return r |
|
1671 | return r | |
1672 |
|
1672 | |||
1673 | def pull(self, remote, heads=None, force=False): |
|
1673 | def pull(self, remote, heads=None, force=False): | |
1674 | return exchange.pull (self, remote, heads, force) |
|
1674 | return exchange.pull (self, remote, heads, force) | |
1675 |
|
1675 | |||
1676 | def checkpush(self, pushop): |
|
1676 | def checkpush(self, pushop): | |
1677 | """Extensions can override this function if additional checks have |
|
1677 | """Extensions can override this function if additional checks have | |
1678 | to be performed before pushing, or call it if they override push |
|
1678 | to be performed before pushing, or call it if they override push | |
1679 | command. |
|
1679 | command. | |
1680 | """ |
|
1680 | """ | |
1681 | pass |
|
1681 | pass | |
1682 |
|
1682 | |||
1683 | def push(self, remote, force=False, revs=None, newbranch=False): |
|
1683 | def push(self, remote, force=False, revs=None, newbranch=False): | |
1684 | return exchange.push(self, remote, force, revs, newbranch) |
|
1684 | return exchange.push(self, remote, force, revs, newbranch) | |
1685 |
|
1685 | |||
1686 | def changegroupinfo(self, nodes, source): |
|
|||
1687 | if self.ui.verbose or source == 'bundle': |
|
|||
1688 | self.ui.status(_("%d changesets found\n") % len(nodes)) |
|
|||
1689 | if self.ui.debugflag: |
|
|||
1690 | self.ui.debug("list of changesets:\n") |
|
|||
1691 | for node in nodes: |
|
|||
1692 | self.ui.debug("%s\n" % hex(node)) |
|
|||
1693 |
|
||||
1694 | def changegroupsubset(self, roots, heads, source): |
|
1686 | def changegroupsubset(self, roots, heads, source): | |
1695 | """Compute a changegroup consisting of all the nodes that are |
|
1687 | """Compute a changegroup consisting of all the nodes that are | |
1696 | descendants of any of the roots and ancestors of any of the heads. |
|
1688 | descendants of any of the roots and ancestors of any of the heads. | |
1697 | Return a chunkbuffer object whose read() method will return |
|
1689 | Return a chunkbuffer object whose read() method will return | |
1698 | successive changegroup chunks. |
|
1690 | successive changegroup chunks. | |
1699 |
|
1691 | |||
1700 | It is fairly complex as determining which filenodes and which |
|
1692 | It is fairly complex as determining which filenodes and which | |
1701 | manifest nodes need to be included for the changeset to be complete |
|
1693 | manifest nodes need to be included for the changeset to be complete | |
1702 | is non-trivial. |
|
1694 | is non-trivial. | |
1703 |
|
1695 | |||
1704 | Another wrinkle is doing the reverse, figuring out which changeset in |
|
1696 | Another wrinkle is doing the reverse, figuring out which changeset in | |
1705 | the changegroup a particular filenode or manifestnode belongs to. |
|
1697 | the changegroup a particular filenode or manifestnode belongs to. | |
1706 | """ |
|
1698 | """ | |
1707 | cl = self.changelog |
|
1699 | cl = self.changelog | |
1708 | if not roots: |
|
1700 | if not roots: | |
1709 | roots = [nullid] |
|
1701 | roots = [nullid] | |
1710 | # TODO: remove call to nodesbetween. |
|
1702 | # TODO: remove call to nodesbetween. | |
1711 | csets, roots, heads = cl.nodesbetween(roots, heads) |
|
1703 | csets, roots, heads = cl.nodesbetween(roots, heads) | |
1712 | discbases = [] |
|
1704 | discbases = [] | |
1713 | for n in roots: |
|
1705 | for n in roots: | |
1714 | discbases.extend([p for p in cl.parents(n) if p != nullid]) |
|
1706 | discbases.extend([p for p in cl.parents(n) if p != nullid]) | |
1715 | outgoing = discovery.outgoing(cl, discbases, heads) |
|
1707 | outgoing = discovery.outgoing(cl, discbases, heads) | |
1716 | bundler = changegroup.bundle10(self) |
|
1708 | bundler = changegroup.bundle10(self) | |
1717 | return changegroup.getsubset(self, outgoing, bundler, source) |
|
1709 | return changegroup.getsubset(self, outgoing, bundler, source) | |
1718 |
|
1710 | |||
1719 | def getlocalbundle(self, source, outgoing, bundlecaps=None): |
|
1711 | def getlocalbundle(self, source, outgoing, bundlecaps=None): | |
1720 | """Like getbundle, but taking a discovery.outgoing as an argument. |
|
1712 | """Like getbundle, but taking a discovery.outgoing as an argument. | |
1721 |
|
1713 | |||
1722 | This is only implemented for local repos and reuses potentially |
|
1714 | This is only implemented for local repos and reuses potentially | |
1723 | precomputed sets in outgoing.""" |
|
1715 | precomputed sets in outgoing.""" | |
1724 | if not outgoing.missing: |
|
1716 | if not outgoing.missing: | |
1725 | return None |
|
1717 | return None | |
1726 | bundler = changegroup.bundle10(self, bundlecaps) |
|
1718 | bundler = changegroup.bundle10(self, bundlecaps) | |
1727 | return changegroup.getsubset(self, outgoing, bundler, source) |
|
1719 | return changegroup.getsubset(self, outgoing, bundler, source) | |
1728 |
|
1720 | |||
1729 | def getbundle(self, source, heads=None, common=None, bundlecaps=None): |
|
1721 | def getbundle(self, source, heads=None, common=None, bundlecaps=None): | |
1730 | """Like changegroupsubset, but returns the set difference between the |
|
1722 | """Like changegroupsubset, but returns the set difference between the | |
1731 | ancestors of heads and the ancestors common. |
|
1723 | ancestors of heads and the ancestors common. | |
1732 |
|
1724 | |||
1733 | If heads is None, use the local heads. If common is None, use [nullid]. |
|
1725 | If heads is None, use the local heads. If common is None, use [nullid]. | |
1734 |
|
1726 | |||
1735 | The nodes in common might not all be known locally due to the way the |
|
1727 | The nodes in common might not all be known locally due to the way the | |
1736 | current discovery protocol works. |
|
1728 | current discovery protocol works. | |
1737 | """ |
|
1729 | """ | |
1738 | cl = self.changelog |
|
1730 | cl = self.changelog | |
1739 | if common: |
|
1731 | if common: | |
1740 | hasnode = cl.hasnode |
|
1732 | hasnode = cl.hasnode | |
1741 | common = [n for n in common if hasnode(n)] |
|
1733 | common = [n for n in common if hasnode(n)] | |
1742 | else: |
|
1734 | else: | |
1743 | common = [nullid] |
|
1735 | common = [nullid] | |
1744 | if not heads: |
|
1736 | if not heads: | |
1745 | heads = cl.heads() |
|
1737 | heads = cl.heads() | |
1746 | return self.getlocalbundle(source, |
|
1738 | return self.getlocalbundle(source, | |
1747 | discovery.outgoing(cl, common, heads), |
|
1739 | discovery.outgoing(cl, common, heads), | |
1748 | bundlecaps=bundlecaps) |
|
1740 | bundlecaps=bundlecaps) | |
1749 |
|
1741 | |||
1750 | def changegroup(self, basenodes, source): |
|
1742 | def changegroup(self, basenodes, source): | |
1751 | # to avoid a race we use changegroupsubset() (issue1320) |
|
1743 | # to avoid a race we use changegroupsubset() (issue1320) | |
1752 | return self.changegroupsubset(basenodes, self.heads(), source) |
|
1744 | return self.changegroupsubset(basenodes, self.heads(), source) | |
1753 |
|
1745 | |||
1754 | @unfilteredmethod |
|
1746 | @unfilteredmethod | |
1755 | def addchangegroup(self, source, srctype, url, emptyok=False): |
|
1747 | def addchangegroup(self, source, srctype, url, emptyok=False): | |
1756 | """Add the changegroup returned by source.read() to this repo. |
|
1748 | """Add the changegroup returned by source.read() to this repo. | |
1757 | srctype is a string like 'push', 'pull', or 'unbundle'. url is |
|
1749 | srctype is a string like 'push', 'pull', or 'unbundle'. url is | |
1758 | the URL of the repo where this changegroup is coming from. |
|
1750 | the URL of the repo where this changegroup is coming from. | |
1759 |
|
1751 | |||
1760 | Return an integer summarizing the change to this repo: |
|
1752 | Return an integer summarizing the change to this repo: | |
1761 | - nothing changed or no source: 0 |
|
1753 | - nothing changed or no source: 0 | |
1762 | - more heads than before: 1+added heads (2..n) |
|
1754 | - more heads than before: 1+added heads (2..n) | |
1763 | - fewer heads than before: -1-removed heads (-2..-n) |
|
1755 | - fewer heads than before: -1-removed heads (-2..-n) | |
1764 | - number of heads stays the same: 1 |
|
1756 | - number of heads stays the same: 1 | |
1765 | """ |
|
1757 | """ | |
1766 | def csmap(x): |
|
1758 | def csmap(x): | |
1767 | self.ui.debug("add changeset %s\n" % short(x)) |
|
1759 | self.ui.debug("add changeset %s\n" % short(x)) | |
1768 | return len(cl) |
|
1760 | return len(cl) | |
1769 |
|
1761 | |||
1770 | def revmap(x): |
|
1762 | def revmap(x): | |
1771 | return cl.rev(x) |
|
1763 | return cl.rev(x) | |
1772 |
|
1764 | |||
1773 | if not source: |
|
1765 | if not source: | |
1774 | return 0 |
|
1766 | return 0 | |
1775 |
|
1767 | |||
1776 | self.hook('prechangegroup', throw=True, source=srctype, url=url) |
|
1768 | self.hook('prechangegroup', throw=True, source=srctype, url=url) | |
1777 |
|
1769 | |||
1778 | changesets = files = revisions = 0 |
|
1770 | changesets = files = revisions = 0 | |
1779 | efiles = set() |
|
1771 | efiles = set() | |
1780 |
|
1772 | |||
1781 | # write changelog data to temp files so concurrent readers will not see |
|
1773 | # write changelog data to temp files so concurrent readers will not see | |
1782 | # inconsistent view |
|
1774 | # inconsistent view | |
1783 | cl = self.changelog |
|
1775 | cl = self.changelog | |
1784 | cl.delayupdate() |
|
1776 | cl.delayupdate() | |
1785 | oldheads = cl.heads() |
|
1777 | oldheads = cl.heads() | |
1786 |
|
1778 | |||
1787 | tr = self.transaction("\n".join([srctype, util.hidepassword(url)])) |
|
1779 | tr = self.transaction("\n".join([srctype, util.hidepassword(url)])) | |
1788 | try: |
|
1780 | try: | |
1789 | trp = weakref.proxy(tr) |
|
1781 | trp = weakref.proxy(tr) | |
1790 | # pull off the changeset group |
|
1782 | # pull off the changeset group | |
1791 | self.ui.status(_("adding changesets\n")) |
|
1783 | self.ui.status(_("adding changesets\n")) | |
1792 | clstart = len(cl) |
|
1784 | clstart = len(cl) | |
1793 | class prog(object): |
|
1785 | class prog(object): | |
1794 | step = _('changesets') |
|
1786 | step = _('changesets') | |
1795 | count = 1 |
|
1787 | count = 1 | |
1796 | ui = self.ui |
|
1788 | ui = self.ui | |
1797 | total = None |
|
1789 | total = None | |
1798 | def __call__(self): |
|
1790 | def __call__(self): | |
1799 | self.ui.progress(self.step, self.count, unit=_('chunks'), |
|
1791 | self.ui.progress(self.step, self.count, unit=_('chunks'), | |
1800 | total=self.total) |
|
1792 | total=self.total) | |
1801 | self.count += 1 |
|
1793 | self.count += 1 | |
1802 | pr = prog() |
|
1794 | pr = prog() | |
1803 | source.callback = pr |
|
1795 | source.callback = pr | |
1804 |
|
1796 | |||
1805 | source.changelogheader() |
|
1797 | source.changelogheader() | |
1806 | srccontent = cl.addgroup(source, csmap, trp) |
|
1798 | srccontent = cl.addgroup(source, csmap, trp) | |
1807 | if not (srccontent or emptyok): |
|
1799 | if not (srccontent or emptyok): | |
1808 | raise util.Abort(_("received changelog group is empty")) |
|
1800 | raise util.Abort(_("received changelog group is empty")) | |
1809 | clend = len(cl) |
|
1801 | clend = len(cl) | |
1810 | changesets = clend - clstart |
|
1802 | changesets = clend - clstart | |
1811 | for c in xrange(clstart, clend): |
|
1803 | for c in xrange(clstart, clend): | |
1812 | efiles.update(self[c].files()) |
|
1804 | efiles.update(self[c].files()) | |
1813 | efiles = len(efiles) |
|
1805 | efiles = len(efiles) | |
1814 | self.ui.progress(_('changesets'), None) |
|
1806 | self.ui.progress(_('changesets'), None) | |
1815 |
|
1807 | |||
1816 | # pull off the manifest group |
|
1808 | # pull off the manifest group | |
1817 | self.ui.status(_("adding manifests\n")) |
|
1809 | self.ui.status(_("adding manifests\n")) | |
1818 | pr.step = _('manifests') |
|
1810 | pr.step = _('manifests') | |
1819 | pr.count = 1 |
|
1811 | pr.count = 1 | |
1820 | pr.total = changesets # manifests <= changesets |
|
1812 | pr.total = changesets # manifests <= changesets | |
1821 | # no need to check for empty manifest group here: |
|
1813 | # no need to check for empty manifest group here: | |
1822 | # if the result of the merge of 1 and 2 is the same in 3 and 4, |
|
1814 | # if the result of the merge of 1 and 2 is the same in 3 and 4, | |
1823 | # no new manifest will be created and the manifest group will |
|
1815 | # no new manifest will be created and the manifest group will | |
1824 | # be empty during the pull |
|
1816 | # be empty during the pull | |
1825 | source.manifestheader() |
|
1817 | source.manifestheader() | |
1826 | self.manifest.addgroup(source, revmap, trp) |
|
1818 | self.manifest.addgroup(source, revmap, trp) | |
1827 | self.ui.progress(_('manifests'), None) |
|
1819 | self.ui.progress(_('manifests'), None) | |
1828 |
|
1820 | |||
1829 | needfiles = {} |
|
1821 | needfiles = {} | |
1830 | if self.ui.configbool('server', 'validate', default=False): |
|
1822 | if self.ui.configbool('server', 'validate', default=False): | |
1831 | # validate incoming csets have their manifests |
|
1823 | # validate incoming csets have their manifests | |
1832 | for cset in xrange(clstart, clend): |
|
1824 | for cset in xrange(clstart, clend): | |
1833 | mfest = self.changelog.read(self.changelog.node(cset))[0] |
|
1825 | mfest = self.changelog.read(self.changelog.node(cset))[0] | |
1834 | mfest = self.manifest.readdelta(mfest) |
|
1826 | mfest = self.manifest.readdelta(mfest) | |
1835 | # store file nodes we must see |
|
1827 | # store file nodes we must see | |
1836 | for f, n in mfest.iteritems(): |
|
1828 | for f, n in mfest.iteritems(): | |
1837 | needfiles.setdefault(f, set()).add(n) |
|
1829 | needfiles.setdefault(f, set()).add(n) | |
1838 |
|
1830 | |||
1839 | # process the files |
|
1831 | # process the files | |
1840 | self.ui.status(_("adding file changes\n")) |
|
1832 | self.ui.status(_("adding file changes\n")) | |
1841 | pr.step = _('files') |
|
1833 | pr.step = _('files') | |
1842 | pr.count = 1 |
|
1834 | pr.count = 1 | |
1843 | pr.total = efiles |
|
1835 | pr.total = efiles | |
1844 | source.callback = None |
|
1836 | source.callback = None | |
1845 |
|
1837 | |||
1846 | newrevs, newfiles = self.addchangegroupfiles(source, revmap, trp, |
|
1838 | newrevs, newfiles = self.addchangegroupfiles(source, revmap, trp, | |
1847 | pr, needfiles) |
|
1839 | pr, needfiles) | |
1848 | revisions += newrevs |
|
1840 | revisions += newrevs | |
1849 | files += newfiles |
|
1841 | files += newfiles | |
1850 |
|
1842 | |||
1851 | dh = 0 |
|
1843 | dh = 0 | |
1852 | if oldheads: |
|
1844 | if oldheads: | |
1853 | heads = cl.heads() |
|
1845 | heads = cl.heads() | |
1854 | dh = len(heads) - len(oldheads) |
|
1846 | dh = len(heads) - len(oldheads) | |
1855 | for h in heads: |
|
1847 | for h in heads: | |
1856 | if h not in oldheads and self[h].closesbranch(): |
|
1848 | if h not in oldheads and self[h].closesbranch(): | |
1857 | dh -= 1 |
|
1849 | dh -= 1 | |
1858 | htext = "" |
|
1850 | htext = "" | |
1859 | if dh: |
|
1851 | if dh: | |
1860 | htext = _(" (%+d heads)") % dh |
|
1852 | htext = _(" (%+d heads)") % dh | |
1861 |
|
1853 | |||
1862 | self.ui.status(_("added %d changesets" |
|
1854 | self.ui.status(_("added %d changesets" | |
1863 | " with %d changes to %d files%s\n") |
|
1855 | " with %d changes to %d files%s\n") | |
1864 | % (changesets, revisions, files, htext)) |
|
1856 | % (changesets, revisions, files, htext)) | |
1865 | self.invalidatevolatilesets() |
|
1857 | self.invalidatevolatilesets() | |
1866 |
|
1858 | |||
1867 | if changesets > 0: |
|
1859 | if changesets > 0: | |
1868 | p = lambda: cl.writepending() and self.root or "" |
|
1860 | p = lambda: cl.writepending() and self.root or "" | |
1869 | self.hook('pretxnchangegroup', throw=True, |
|
1861 | self.hook('pretxnchangegroup', throw=True, | |
1870 | node=hex(cl.node(clstart)), source=srctype, |
|
1862 | node=hex(cl.node(clstart)), source=srctype, | |
1871 | url=url, pending=p) |
|
1863 | url=url, pending=p) | |
1872 |
|
1864 | |||
1873 | added = [cl.node(r) for r in xrange(clstart, clend)] |
|
1865 | added = [cl.node(r) for r in xrange(clstart, clend)] | |
1874 | publishing = self.ui.configbool('phases', 'publish', True) |
|
1866 | publishing = self.ui.configbool('phases', 'publish', True) | |
1875 | if srctype == 'push': |
|
1867 | if srctype == 'push': | |
1876 | # Old servers can not push the boundary themselves. |
|
1868 | # Old servers can not push the boundary themselves. | |
1877 | # New servers won't push the boundary if changeset already |
|
1869 | # New servers won't push the boundary if changeset already | |
1878 | # exists locally as secret |
|
1870 | # exists locally as secret | |
1879 | # |
|
1871 | # | |
1880 | # We should not use added here but the list of all change in |
|
1872 | # We should not use added here but the list of all change in | |
1881 | # the bundle |
|
1873 | # the bundle | |
1882 | if publishing: |
|
1874 | if publishing: | |
1883 | phases.advanceboundary(self, phases.public, srccontent) |
|
1875 | phases.advanceboundary(self, phases.public, srccontent) | |
1884 | else: |
|
1876 | else: | |
1885 | phases.advanceboundary(self, phases.draft, srccontent) |
|
1877 | phases.advanceboundary(self, phases.draft, srccontent) | |
1886 | phases.retractboundary(self, phases.draft, added) |
|
1878 | phases.retractboundary(self, phases.draft, added) | |
1887 | elif srctype != 'strip': |
|
1879 | elif srctype != 'strip': | |
1888 | # publishing only alter behavior during push |
|
1880 | # publishing only alter behavior during push | |
1889 | # |
|
1881 | # | |
1890 | # strip should not touch boundary at all |
|
1882 | # strip should not touch boundary at all | |
1891 | phases.retractboundary(self, phases.draft, added) |
|
1883 | phases.retractboundary(self, phases.draft, added) | |
1892 |
|
1884 | |||
1893 | # make changelog see real files again |
|
1885 | # make changelog see real files again | |
1894 | cl.finalize(trp) |
|
1886 | cl.finalize(trp) | |
1895 |
|
1887 | |||
1896 | tr.close() |
|
1888 | tr.close() | |
1897 |
|
1889 | |||
1898 | if changesets > 0: |
|
1890 | if changesets > 0: | |
1899 | if srctype != 'strip': |
|
1891 | if srctype != 'strip': | |
1900 | # During strip, branchcache is invalid but coming call to |
|
1892 | # During strip, branchcache is invalid but coming call to | |
1901 | # `destroyed` will repair it. |
|
1893 | # `destroyed` will repair it. | |
1902 | # In other case we can safely update cache on disk. |
|
1894 | # In other case we can safely update cache on disk. | |
1903 | branchmap.updatecache(self.filtered('served')) |
|
1895 | branchmap.updatecache(self.filtered('served')) | |
1904 | def runhooks(): |
|
1896 | def runhooks(): | |
1905 | # These hooks run when the lock releases, not when the |
|
1897 | # These hooks run when the lock releases, not when the | |
1906 | # transaction closes. So it's possible for the changelog |
|
1898 | # transaction closes. So it's possible for the changelog | |
1907 | # to have changed since we last saw it. |
|
1899 | # to have changed since we last saw it. | |
1908 | if clstart >= len(self): |
|
1900 | if clstart >= len(self): | |
1909 | return |
|
1901 | return | |
1910 |
|
1902 | |||
1911 | # forcefully update the on-disk branch cache |
|
1903 | # forcefully update the on-disk branch cache | |
1912 | self.ui.debug("updating the branch cache\n") |
|
1904 | self.ui.debug("updating the branch cache\n") | |
1913 | self.hook("changegroup", node=hex(cl.node(clstart)), |
|
1905 | self.hook("changegroup", node=hex(cl.node(clstart)), | |
1914 | source=srctype, url=url) |
|
1906 | source=srctype, url=url) | |
1915 |
|
1907 | |||
1916 | for n in added: |
|
1908 | for n in added: | |
1917 | self.hook("incoming", node=hex(n), source=srctype, |
|
1909 | self.hook("incoming", node=hex(n), source=srctype, | |
1918 | url=url) |
|
1910 | url=url) | |
1919 |
|
1911 | |||
1920 | newheads = [h for h in self.heads() if h not in oldheads] |
|
1912 | newheads = [h for h in self.heads() if h not in oldheads] | |
1921 | self.ui.log("incoming", |
|
1913 | self.ui.log("incoming", | |
1922 | "%s incoming changes - new heads: %s\n", |
|
1914 | "%s incoming changes - new heads: %s\n", | |
1923 | len(added), |
|
1915 | len(added), | |
1924 | ', '.join([hex(c[:6]) for c in newheads])) |
|
1916 | ', '.join([hex(c[:6]) for c in newheads])) | |
1925 | self._afterlock(runhooks) |
|
1917 | self._afterlock(runhooks) | |
1926 |
|
1918 | |||
1927 | finally: |
|
1919 | finally: | |
1928 | tr.release() |
|
1920 | tr.release() | |
1929 | # never return 0 here: |
|
1921 | # never return 0 here: | |
1930 | if dh < 0: |
|
1922 | if dh < 0: | |
1931 | return dh - 1 |
|
1923 | return dh - 1 | |
1932 | else: |
|
1924 | else: | |
1933 | return dh + 1 |
|
1925 | return dh + 1 | |
1934 |
|
1926 | |||
1935 | def addchangegroupfiles(self, source, revmap, trp, pr, needfiles): |
|
1927 | def addchangegroupfiles(self, source, revmap, trp, pr, needfiles): | |
1936 | revisions = 0 |
|
1928 | revisions = 0 | |
1937 | files = 0 |
|
1929 | files = 0 | |
1938 | while True: |
|
1930 | while True: | |
1939 | chunkdata = source.filelogheader() |
|
1931 | chunkdata = source.filelogheader() | |
1940 | if not chunkdata: |
|
1932 | if not chunkdata: | |
1941 | break |
|
1933 | break | |
1942 | f = chunkdata["filename"] |
|
1934 | f = chunkdata["filename"] | |
1943 | self.ui.debug("adding %s revisions\n" % f) |
|
1935 | self.ui.debug("adding %s revisions\n" % f) | |
1944 | pr() |
|
1936 | pr() | |
1945 | fl = self.file(f) |
|
1937 | fl = self.file(f) | |
1946 | o = len(fl) |
|
1938 | o = len(fl) | |
1947 | if not fl.addgroup(source, revmap, trp): |
|
1939 | if not fl.addgroup(source, revmap, trp): | |
1948 | raise util.Abort(_("received file revlog group is empty")) |
|
1940 | raise util.Abort(_("received file revlog group is empty")) | |
1949 | revisions += len(fl) - o |
|
1941 | revisions += len(fl) - o | |
1950 | files += 1 |
|
1942 | files += 1 | |
1951 | if f in needfiles: |
|
1943 | if f in needfiles: | |
1952 | needs = needfiles[f] |
|
1944 | needs = needfiles[f] | |
1953 | for new in xrange(o, len(fl)): |
|
1945 | for new in xrange(o, len(fl)): | |
1954 | n = fl.node(new) |
|
1946 | n = fl.node(new) | |
1955 | if n in needs: |
|
1947 | if n in needs: | |
1956 | needs.remove(n) |
|
1948 | needs.remove(n) | |
1957 | else: |
|
1949 | else: | |
1958 | raise util.Abort( |
|
1950 | raise util.Abort( | |
1959 | _("received spurious file revlog entry")) |
|
1951 | _("received spurious file revlog entry")) | |
1960 | if not needs: |
|
1952 | if not needs: | |
1961 | del needfiles[f] |
|
1953 | del needfiles[f] | |
1962 | self.ui.progress(_('files'), None) |
|
1954 | self.ui.progress(_('files'), None) | |
1963 |
|
1955 | |||
1964 | for f, needs in needfiles.iteritems(): |
|
1956 | for f, needs in needfiles.iteritems(): | |
1965 | fl = self.file(f) |
|
1957 | fl = self.file(f) | |
1966 | for n in needs: |
|
1958 | for n in needs: | |
1967 | try: |
|
1959 | try: | |
1968 | fl.rev(n) |
|
1960 | fl.rev(n) | |
1969 | except error.LookupError: |
|
1961 | except error.LookupError: | |
1970 | raise util.Abort( |
|
1962 | raise util.Abort( | |
1971 | _('missing file data for %s:%s - run hg verify') % |
|
1963 | _('missing file data for %s:%s - run hg verify') % | |
1972 | (f, hex(n))) |
|
1964 | (f, hex(n))) | |
1973 |
|
1965 | |||
1974 | return revisions, files |
|
1966 | return revisions, files | |
1975 |
|
1967 | |||
1976 | def stream_in(self, remote, requirements): |
|
1968 | def stream_in(self, remote, requirements): | |
1977 | lock = self.lock() |
|
1969 | lock = self.lock() | |
1978 | try: |
|
1970 | try: | |
1979 | # Save remote branchmap. We will use it later |
|
1971 | # Save remote branchmap. We will use it later | |
1980 | # to speed up branchcache creation |
|
1972 | # to speed up branchcache creation | |
1981 | rbranchmap = None |
|
1973 | rbranchmap = None | |
1982 | if remote.capable("branchmap"): |
|
1974 | if remote.capable("branchmap"): | |
1983 | rbranchmap = remote.branchmap() |
|
1975 | rbranchmap = remote.branchmap() | |
1984 |
|
1976 | |||
1985 | fp = remote.stream_out() |
|
1977 | fp = remote.stream_out() | |
1986 | l = fp.readline() |
|
1978 | l = fp.readline() | |
1987 | try: |
|
1979 | try: | |
1988 | resp = int(l) |
|
1980 | resp = int(l) | |
1989 | except ValueError: |
|
1981 | except ValueError: | |
1990 | raise error.ResponseError( |
|
1982 | raise error.ResponseError( | |
1991 | _('unexpected response from remote server:'), l) |
|
1983 | _('unexpected response from remote server:'), l) | |
1992 | if resp == 1: |
|
1984 | if resp == 1: | |
1993 | raise util.Abort(_('operation forbidden by server')) |
|
1985 | raise util.Abort(_('operation forbidden by server')) | |
1994 | elif resp == 2: |
|
1986 | elif resp == 2: | |
1995 | raise util.Abort(_('locking the remote repository failed')) |
|
1987 | raise util.Abort(_('locking the remote repository failed')) | |
1996 | elif resp != 0: |
|
1988 | elif resp != 0: | |
1997 | raise util.Abort(_('the server sent an unknown error code')) |
|
1989 | raise util.Abort(_('the server sent an unknown error code')) | |
1998 | self.ui.status(_('streaming all changes\n')) |
|
1990 | self.ui.status(_('streaming all changes\n')) | |
1999 | l = fp.readline() |
|
1991 | l = fp.readline() | |
2000 | try: |
|
1992 | try: | |
2001 | total_files, total_bytes = map(int, l.split(' ', 1)) |
|
1993 | total_files, total_bytes = map(int, l.split(' ', 1)) | |
2002 | except (ValueError, TypeError): |
|
1994 | except (ValueError, TypeError): | |
2003 | raise error.ResponseError( |
|
1995 | raise error.ResponseError( | |
2004 | _('unexpected response from remote server:'), l) |
|
1996 | _('unexpected response from remote server:'), l) | |
2005 | self.ui.status(_('%d files to transfer, %s of data\n') % |
|
1997 | self.ui.status(_('%d files to transfer, %s of data\n') % | |
2006 | (total_files, util.bytecount(total_bytes))) |
|
1998 | (total_files, util.bytecount(total_bytes))) | |
2007 | handled_bytes = 0 |
|
1999 | handled_bytes = 0 | |
2008 | self.ui.progress(_('clone'), 0, total=total_bytes) |
|
2000 | self.ui.progress(_('clone'), 0, total=total_bytes) | |
2009 | start = time.time() |
|
2001 | start = time.time() | |
2010 |
|
2002 | |||
2011 | tr = self.transaction(_('clone')) |
|
2003 | tr = self.transaction(_('clone')) | |
2012 | try: |
|
2004 | try: | |
2013 | for i in xrange(total_files): |
|
2005 | for i in xrange(total_files): | |
2014 | # XXX doesn't support '\n' or '\r' in filenames |
|
2006 | # XXX doesn't support '\n' or '\r' in filenames | |
2015 | l = fp.readline() |
|
2007 | l = fp.readline() | |
2016 | try: |
|
2008 | try: | |
2017 | name, size = l.split('\0', 1) |
|
2009 | name, size = l.split('\0', 1) | |
2018 | size = int(size) |
|
2010 | size = int(size) | |
2019 | except (ValueError, TypeError): |
|
2011 | except (ValueError, TypeError): | |
2020 | raise error.ResponseError( |
|
2012 | raise error.ResponseError( | |
2021 | _('unexpected response from remote server:'), l) |
|
2013 | _('unexpected response from remote server:'), l) | |
2022 | if self.ui.debugflag: |
|
2014 | if self.ui.debugflag: | |
2023 | self.ui.debug('adding %s (%s)\n' % |
|
2015 | self.ui.debug('adding %s (%s)\n' % | |
2024 | (name, util.bytecount(size))) |
|
2016 | (name, util.bytecount(size))) | |
2025 | # for backwards compat, name was partially encoded |
|
2017 | # for backwards compat, name was partially encoded | |
2026 | ofp = self.sopener(store.decodedir(name), 'w') |
|
2018 | ofp = self.sopener(store.decodedir(name), 'w') | |
2027 | for chunk in util.filechunkiter(fp, limit=size): |
|
2019 | for chunk in util.filechunkiter(fp, limit=size): | |
2028 | handled_bytes += len(chunk) |
|
2020 | handled_bytes += len(chunk) | |
2029 | self.ui.progress(_('clone'), handled_bytes, |
|
2021 | self.ui.progress(_('clone'), handled_bytes, | |
2030 | total=total_bytes) |
|
2022 | total=total_bytes) | |
2031 | ofp.write(chunk) |
|
2023 | ofp.write(chunk) | |
2032 | ofp.close() |
|
2024 | ofp.close() | |
2033 | tr.close() |
|
2025 | tr.close() | |
2034 | finally: |
|
2026 | finally: | |
2035 | tr.release() |
|
2027 | tr.release() | |
2036 |
|
2028 | |||
2037 | # Writing straight to files circumvented the inmemory caches |
|
2029 | # Writing straight to files circumvented the inmemory caches | |
2038 | self.invalidate() |
|
2030 | self.invalidate() | |
2039 |
|
2031 | |||
2040 | elapsed = time.time() - start |
|
2032 | elapsed = time.time() - start | |
2041 | if elapsed <= 0: |
|
2033 | if elapsed <= 0: | |
2042 | elapsed = 0.001 |
|
2034 | elapsed = 0.001 | |
2043 | self.ui.progress(_('clone'), None) |
|
2035 | self.ui.progress(_('clone'), None) | |
2044 | self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % |
|
2036 | self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % | |
2045 | (util.bytecount(total_bytes), elapsed, |
|
2037 | (util.bytecount(total_bytes), elapsed, | |
2046 | util.bytecount(total_bytes / elapsed))) |
|
2038 | util.bytecount(total_bytes / elapsed))) | |
2047 |
|
2039 | |||
2048 | # new requirements = old non-format requirements + |
|
2040 | # new requirements = old non-format requirements + | |
2049 | # new format-related |
|
2041 | # new format-related | |
2050 | # requirements from the streamed-in repository |
|
2042 | # requirements from the streamed-in repository | |
2051 | requirements.update(set(self.requirements) - self.supportedformats) |
|
2043 | requirements.update(set(self.requirements) - self.supportedformats) | |
2052 | self._applyrequirements(requirements) |
|
2044 | self._applyrequirements(requirements) | |
2053 | self._writerequirements() |
|
2045 | self._writerequirements() | |
2054 |
|
2046 | |||
2055 | if rbranchmap: |
|
2047 | if rbranchmap: | |
2056 | rbheads = [] |
|
2048 | rbheads = [] | |
2057 | for bheads in rbranchmap.itervalues(): |
|
2049 | for bheads in rbranchmap.itervalues(): | |
2058 | rbheads.extend(bheads) |
|
2050 | rbheads.extend(bheads) | |
2059 |
|
2051 | |||
2060 | if rbheads: |
|
2052 | if rbheads: | |
2061 | rtiprev = max((int(self.changelog.rev(node)) |
|
2053 | rtiprev = max((int(self.changelog.rev(node)) | |
2062 | for node in rbheads)) |
|
2054 | for node in rbheads)) | |
2063 | cache = branchmap.branchcache(rbranchmap, |
|
2055 | cache = branchmap.branchcache(rbranchmap, | |
2064 | self[rtiprev].node(), |
|
2056 | self[rtiprev].node(), | |
2065 | rtiprev) |
|
2057 | rtiprev) | |
2066 | # Try to stick it as low as possible |
|
2058 | # Try to stick it as low as possible | |
2067 | # filter above served are unlikely to be fetch from a clone |
|
2059 | # filter above served are unlikely to be fetch from a clone | |
2068 | for candidate in ('base', 'immutable', 'served'): |
|
2060 | for candidate in ('base', 'immutable', 'served'): | |
2069 | rview = self.filtered(candidate) |
|
2061 | rview = self.filtered(candidate) | |
2070 | if cache.validfor(rview): |
|
2062 | if cache.validfor(rview): | |
2071 | self._branchcaches[candidate] = cache |
|
2063 | self._branchcaches[candidate] = cache | |
2072 | cache.write(rview) |
|
2064 | cache.write(rview) | |
2073 | break |
|
2065 | break | |
2074 | self.invalidate() |
|
2066 | self.invalidate() | |
2075 | return len(self.heads()) + 1 |
|
2067 | return len(self.heads()) + 1 | |
2076 | finally: |
|
2068 | finally: | |
2077 | lock.release() |
|
2069 | lock.release() | |
2078 |
|
2070 | |||
2079 | def clone(self, remote, heads=[], stream=False): |
|
2071 | def clone(self, remote, heads=[], stream=False): | |
2080 | '''clone remote repository. |
|
2072 | '''clone remote repository. | |
2081 |
|
2073 | |||
2082 | keyword arguments: |
|
2074 | keyword arguments: | |
2083 | heads: list of revs to clone (forces use of pull) |
|
2075 | heads: list of revs to clone (forces use of pull) | |
2084 | stream: use streaming clone if possible''' |
|
2076 | stream: use streaming clone if possible''' | |
2085 |
|
2077 | |||
2086 | # now, all clients that can request uncompressed clones can |
|
2078 | # now, all clients that can request uncompressed clones can | |
2087 | # read repo formats supported by all servers that can serve |
|
2079 | # read repo formats supported by all servers that can serve | |
2088 | # them. |
|
2080 | # them. | |
2089 |
|
2081 | |||
2090 | # if revlog format changes, client will have to check version |
|
2082 | # if revlog format changes, client will have to check version | |
2091 | # and format flags on "stream" capability, and use |
|
2083 | # and format flags on "stream" capability, and use | |
2092 | # uncompressed only if compatible. |
|
2084 | # uncompressed only if compatible. | |
2093 |
|
2085 | |||
2094 | if not stream: |
|
2086 | if not stream: | |
2095 | # if the server explicitly prefers to stream (for fast LANs) |
|
2087 | # if the server explicitly prefers to stream (for fast LANs) | |
2096 | stream = remote.capable('stream-preferred') |
|
2088 | stream = remote.capable('stream-preferred') | |
2097 |
|
2089 | |||
2098 | if stream and not heads: |
|
2090 | if stream and not heads: | |
2099 | # 'stream' means remote revlog format is revlogv1 only |
|
2091 | # 'stream' means remote revlog format is revlogv1 only | |
2100 | if remote.capable('stream'): |
|
2092 | if remote.capable('stream'): | |
2101 | return self.stream_in(remote, set(('revlogv1',))) |
|
2093 | return self.stream_in(remote, set(('revlogv1',))) | |
2102 | # otherwise, 'streamreqs' contains the remote revlog format |
|
2094 | # otherwise, 'streamreqs' contains the remote revlog format | |
2103 | streamreqs = remote.capable('streamreqs') |
|
2095 | streamreqs = remote.capable('streamreqs') | |
2104 | if streamreqs: |
|
2096 | if streamreqs: | |
2105 | streamreqs = set(streamreqs.split(',')) |
|
2097 | streamreqs = set(streamreqs.split(',')) | |
2106 | # if we support it, stream in and adjust our requirements |
|
2098 | # if we support it, stream in and adjust our requirements | |
2107 | if not streamreqs - self.supportedformats: |
|
2099 | if not streamreqs - self.supportedformats: | |
2108 | return self.stream_in(remote, streamreqs) |
|
2100 | return self.stream_in(remote, streamreqs) | |
2109 | return self.pull(remote, heads) |
|
2101 | return self.pull(remote, heads) | |
2110 |
|
2102 | |||
2111 | def pushkey(self, namespace, key, old, new): |
|
2103 | def pushkey(self, namespace, key, old, new): | |
2112 | self.hook('prepushkey', throw=True, namespace=namespace, key=key, |
|
2104 | self.hook('prepushkey', throw=True, namespace=namespace, key=key, | |
2113 | old=old, new=new) |
|
2105 | old=old, new=new) | |
2114 | self.ui.debug('pushing key for "%s:%s"\n' % (namespace, key)) |
|
2106 | self.ui.debug('pushing key for "%s:%s"\n' % (namespace, key)) | |
2115 | ret = pushkey.push(self, namespace, key, old, new) |
|
2107 | ret = pushkey.push(self, namespace, key, old, new) | |
2116 | self.hook('pushkey', namespace=namespace, key=key, old=old, new=new, |
|
2108 | self.hook('pushkey', namespace=namespace, key=key, old=old, new=new, | |
2117 | ret=ret) |
|
2109 | ret=ret) | |
2118 | return ret |
|
2110 | return ret | |
2119 |
|
2111 | |||
2120 | def listkeys(self, namespace): |
|
2112 | def listkeys(self, namespace): | |
2121 | self.hook('prelistkeys', throw=True, namespace=namespace) |
|
2113 | self.hook('prelistkeys', throw=True, namespace=namespace) | |
2122 | self.ui.debug('listing keys for "%s"\n' % namespace) |
|
2114 | self.ui.debug('listing keys for "%s"\n' % namespace) | |
2123 | values = pushkey.list(self, namespace) |
|
2115 | values = pushkey.list(self, namespace) | |
2124 | self.hook('listkeys', namespace=namespace, values=values) |
|
2116 | self.hook('listkeys', namespace=namespace, values=values) | |
2125 | return values |
|
2117 | return values | |
2126 |
|
2118 | |||
2127 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
2119 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
2128 | '''used to test argument passing over the wire''' |
|
2120 | '''used to test argument passing over the wire''' | |
2129 | return "%s %s %s %s %s" % (one, two, three, four, five) |
|
2121 | return "%s %s %s %s %s" % (one, two, three, four, five) | |
2130 |
|
2122 | |||
2131 | def savecommitmessage(self, text): |
|
2123 | def savecommitmessage(self, text): | |
2132 | fp = self.opener('last-message.txt', 'wb') |
|
2124 | fp = self.opener('last-message.txt', 'wb') | |
2133 | try: |
|
2125 | try: | |
2134 | fp.write(text) |
|
2126 | fp.write(text) | |
2135 | finally: |
|
2127 | finally: | |
2136 | fp.close() |
|
2128 | fp.close() | |
2137 | return self.pathto(fp.name[len(self.root) + 1:]) |
|
2129 | return self.pathto(fp.name[len(self.root) + 1:]) | |
2138 |
|
2130 | |||
2139 | # used to avoid circular references so destructors work |
|
2131 | # used to avoid circular references so destructors work | |
2140 | def aftertrans(files): |
|
2132 | def aftertrans(files): | |
2141 | renamefiles = [tuple(t) for t in files] |
|
2133 | renamefiles = [tuple(t) for t in files] | |
2142 | def a(): |
|
2134 | def a(): | |
2143 | for vfs, src, dest in renamefiles: |
|
2135 | for vfs, src, dest in renamefiles: | |
2144 | try: |
|
2136 | try: | |
2145 | vfs.rename(src, dest) |
|
2137 | vfs.rename(src, dest) | |
2146 | except OSError: # journal file does not yet exist |
|
2138 | except OSError: # journal file does not yet exist | |
2147 | pass |
|
2139 | pass | |
2148 | return a |
|
2140 | return a | |
2149 |
|
2141 | |||
2150 | def undoname(fn): |
|
2142 | def undoname(fn): | |
2151 | base, name = os.path.split(fn) |
|
2143 | base, name = os.path.split(fn) | |
2152 | assert name.startswith('journal') |
|
2144 | assert name.startswith('journal') | |
2153 | return os.path.join(base, name.replace('journal', 'undo', 1)) |
|
2145 | return os.path.join(base, name.replace('journal', 'undo', 1)) | |
2154 |
|
2146 | |||
2155 | def instance(ui, path, create): |
|
2147 | def instance(ui, path, create): | |
2156 | return localrepository(ui, util.urllocalpath(path), create) |
|
2148 | return localrepository(ui, util.urllocalpath(path), create) | |
2157 |
|
2149 | |||
2158 | def islocal(path): |
|
2150 | def islocal(path): | |
2159 | return True |
|
2151 | return True |
General Comments 0
You need to be logged in to leave comments.
Login now