Show More
@@ -1,1381 +1,1402 b'' | |||
|
1 | 1 | # hg.py - repository classes for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms |
|
6 | 6 | # of the GNU General Public License, incorporated herein by reference. |
|
7 | 7 | |
|
8 | 8 | import sys, struct, os |
|
9 | 9 | from revlog import * |
|
10 | 10 | from demandload import * |
|
11 | 11 | demandload(globals(), "re lock urllib urllib2 transaction time socket") |
|
12 | 12 | demandload(globals(), "tempfile byterange difflib") |
|
13 | 13 | |
|
14 | 14 | def is_exec(f): |
|
15 | 15 | return (os.stat(f).st_mode & 0100 != 0) |
|
16 | 16 | |
|
17 | 17 | def set_exec(f, mode): |
|
18 | 18 | s = os.stat(f).st_mode |
|
19 | 19 | if (s & 0100 != 0) == mode: |
|
20 | 20 | return |
|
21 | 21 | if mode: |
|
22 | 22 | # Turn on +x for every +r bit when making a file executable |
|
23 | 23 | # and obey umask. |
|
24 | 24 | umask = os.umask(0) |
|
25 | 25 | os.umask(umask) |
|
26 | 26 | os.chmod(f, s | (s & 0444) >> 2 & ~umask) |
|
27 | 27 | else: |
|
28 | 28 | os.chmod(f, s & 0666) |
|
29 | 29 | |
|
30 | 30 | class filelog(revlog): |
|
31 | 31 | def __init__(self, opener, path): |
|
32 | 32 | revlog.__init__(self, opener, |
|
33 | 33 | os.path.join("data", path + ".i"), |
|
34 | 34 | os.path.join("data", path + ".d")) |
|
35 | 35 | |
|
36 | 36 | def read(self, node): |
|
37 |
|
|
|
38 | def add(self, text, transaction, link, p1=None, p2=None): | |
|
37 | t = self.revision(node) | |
|
38 | if t[:2] != '\1\n': | |
|
39 | return t | |
|
40 | s = t.find('\1\n', 2) | |
|
41 | return t[s+2:] | |
|
42 | ||
|
43 | def readmeta(self, node): | |
|
44 | t = self.revision(node) | |
|
45 | if t[:2] != '\1\n': | |
|
46 | return t | |
|
47 | s = t.find('\1\n', 2) | |
|
48 | mt = t[2:s] | |
|
49 | for l in mt.splitlines(): | |
|
50 | k, v = l.split(": ", 1) | |
|
51 | m[k] = v | |
|
52 | return m | |
|
53 | ||
|
54 | def add(self, text, meta, transaction, link, p1=None, p2=None): | |
|
55 | if meta or text[:2] == '\1\n': | |
|
56 | mt = "" | |
|
57 | if meta: | |
|
58 | mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ] | |
|
59 | text = "\1\n" + "".join(mt) + "\1\n" + text | |
|
39 | 60 | return self.addrevision(text, transaction, link, p1, p2) |
|
40 | 61 | |
|
41 | 62 | def annotate(self, node): |
|
42 | 63 | |
|
43 | 64 | def decorate(text, rev): |
|
44 | 65 | return [(rev, l) for l in text.splitlines(1)] |
|
45 | 66 | |
|
46 | 67 | def strip(annotation): |
|
47 | 68 | return [e[1] for e in annotation] |
|
48 | 69 | |
|
49 | 70 | def pair(parent, child): |
|
50 | 71 | new = [] |
|
51 | 72 | sm = difflib.SequenceMatcher(None, strip(parent), strip(child)) |
|
52 | 73 | for o, m, n, s, t in sm.get_opcodes(): |
|
53 | 74 | if o == 'equal': |
|
54 | 75 | new += parent[m:n] |
|
55 | 76 | else: |
|
56 | 77 | new += child[s:t] |
|
57 | 78 | return new |
|
58 | 79 | |
|
59 | 80 | # find all ancestors |
|
60 | 81 | needed = {node:1} |
|
61 | 82 | visit = [node] |
|
62 | 83 | while visit: |
|
63 | 84 | n = visit.pop(0) |
|
64 | 85 | for p in self.parents(n): |
|
65 | 86 | if p not in needed: |
|
66 | 87 | needed[p] = 1 |
|
67 | 88 | visit.append(p) |
|
68 | 89 | else: |
|
69 | 90 | # count how many times we'll use this |
|
70 | 91 | needed[p] += 1 |
|
71 | 92 | |
|
72 | 93 | # sort by revision which is a topological order |
|
73 | 94 | visit = needed.keys() |
|
74 | 95 | visit = [ (self.rev(n), n) for n in visit ] |
|
75 | 96 | visit.sort() |
|
76 | 97 | visit = [ p[1] for p in visit ] |
|
77 | 98 | hist = {} |
|
78 | 99 | |
|
79 | 100 | for n in visit: |
|
80 | 101 | curr = decorate(self.read(n), self.linkrev(n)) |
|
81 | 102 | for p in self.parents(n): |
|
82 | 103 | if p != nullid: |
|
83 | 104 | curr = pair(hist[p], curr) |
|
84 | 105 | # trim the history of unneeded revs |
|
85 | 106 | needed[p] -= 1 |
|
86 | 107 | if not needed[p]: |
|
87 | 108 | del hist[p] |
|
88 | 109 | hist[n] = curr |
|
89 | 110 | |
|
90 | 111 | return hist[n] |
|
91 | 112 | |
|
92 | 113 | class manifest(revlog): |
|
93 | 114 | def __init__(self, opener): |
|
94 | 115 | self.mapcache = None |
|
95 | 116 | self.listcache = None |
|
96 | 117 | self.addlist = None |
|
97 | 118 | revlog.__init__(self, opener, "00manifest.i", "00manifest.d") |
|
98 | 119 | |
|
99 | 120 | def read(self, node): |
|
100 | 121 | if node == nullid: return {} # don't upset local cache |
|
101 | 122 | if self.mapcache and self.mapcache[0] == node: |
|
102 | 123 | return self.mapcache[1].copy() |
|
103 | 124 | text = self.revision(node) |
|
104 | 125 | map = {} |
|
105 | 126 | flag = {} |
|
106 | 127 | self.listcache = (text, text.splitlines(1)) |
|
107 | 128 | for l in self.listcache[1]: |
|
108 | 129 | (f, n) = l.split('\0') |
|
109 | 130 | map[f] = bin(n[:40]) |
|
110 | 131 | flag[f] = (n[40:-1] == "x") |
|
111 | 132 | self.mapcache = (node, map, flag) |
|
112 | 133 | return map |
|
113 | 134 | |
|
114 | 135 | def readflags(self, node): |
|
115 | 136 | if node == nullid: return {} # don't upset local cache |
|
116 | 137 | if not self.mapcache or self.mapcache[0] != node: |
|
117 | 138 | self.read(node) |
|
118 | 139 | return self.mapcache[2] |
|
119 | 140 | |
|
120 | 141 | def diff(self, a, b): |
|
121 | 142 | # this is sneaky, as we're not actually using a and b |
|
122 | 143 | if self.listcache and self.addlist and self.listcache[0] == a: |
|
123 | 144 | d = mdiff.diff(self.listcache[1], self.addlist, 1) |
|
124 | 145 | if mdiff.patch(a, d) != b: |
|
125 | 146 | sys.stderr.write("*** sortdiff failed, falling back ***\n") |
|
126 | 147 | return mdiff.textdiff(a, b) |
|
127 | 148 | return d |
|
128 | 149 | else: |
|
129 | 150 | return mdiff.textdiff(a, b) |
|
130 | 151 | |
|
131 | 152 | def add(self, map, flags, transaction, link, p1=None, p2=None): |
|
132 | 153 | files = map.keys() |
|
133 | 154 | files.sort() |
|
134 | 155 | |
|
135 | 156 | self.addlist = ["%s\000%s%s\n" % |
|
136 | 157 | (f, hex(map[f]), flags[f] and "x" or '') |
|
137 | 158 | for f in files] |
|
138 | 159 | text = "".join(self.addlist) |
|
139 | 160 | |
|
140 | 161 | n = self.addrevision(text, transaction, link, p1, p2) |
|
141 | 162 | self.mapcache = (n, map, flags) |
|
142 | 163 | self.listcache = (text, self.addlist) |
|
143 | 164 | self.addlist = None |
|
144 | 165 | |
|
145 | 166 | return n |
|
146 | 167 | |
|
147 | 168 | class changelog(revlog): |
|
148 | 169 | def __init__(self, opener): |
|
149 | 170 | revlog.__init__(self, opener, "00changelog.i", "00changelog.d") |
|
150 | 171 | |
|
151 | 172 | def extract(self, text): |
|
152 | 173 | if not text: |
|
153 | 174 | return (nullid, "", "0", [], "") |
|
154 | 175 | last = text.index("\n\n") |
|
155 | 176 | desc = text[last + 2:] |
|
156 | 177 | l = text[:last].splitlines() |
|
157 | 178 | manifest = bin(l[0]) |
|
158 | 179 | user = l[1] |
|
159 | 180 | date = l[2] |
|
160 | 181 | files = l[3:] |
|
161 | 182 | return (manifest, user, date, files, desc) |
|
162 | 183 | |
|
163 | 184 | def read(self, node): |
|
164 | 185 | return self.extract(self.revision(node)) |
|
165 | 186 | |
|
166 | 187 | def add(self, manifest, list, desc, transaction, p1=None, p2=None, |
|
167 | 188 | user=None, date=None): |
|
168 | 189 | user = (user or |
|
169 | 190 | os.environ.get("HGUSER") or |
|
170 | 191 | os.environ.get("EMAIL") or |
|
171 | 192 | os.environ.get("LOGNAME", "unknown") + '@' + socket.getfqdn()) |
|
172 | 193 | date = date or "%d %d" % (time.time(), time.timezone) |
|
173 | 194 | list.sort() |
|
174 | 195 | l = [hex(manifest), user, date] + list + ["", desc] |
|
175 | 196 | text = "\n".join(l) |
|
176 | 197 | return self.addrevision(text, transaction, self.count(), p1, p2) |
|
177 | 198 | |
|
178 | 199 | class dirstate: |
|
179 | 200 | def __init__(self, opener, ui, root): |
|
180 | 201 | self.opener = opener |
|
181 | 202 | self.root = root |
|
182 | 203 | self.dirty = 0 |
|
183 | 204 | self.ui = ui |
|
184 | 205 | self.map = None |
|
185 | 206 | self.pl = None |
|
186 | 207 | |
|
187 | 208 | def __del__(self): |
|
188 | 209 | if self.dirty: |
|
189 | 210 | self.write() |
|
190 | 211 | |
|
191 | 212 | def __getitem__(self, key): |
|
192 | 213 | try: |
|
193 | 214 | return self.map[key] |
|
194 | 215 | except TypeError: |
|
195 | 216 | self.read() |
|
196 | 217 | return self[key] |
|
197 | 218 | |
|
198 | 219 | def __contains__(self, key): |
|
199 | 220 | if not self.map: self.read() |
|
200 | 221 | return key in self.map |
|
201 | 222 | |
|
202 | 223 | def parents(self): |
|
203 | 224 | if not self.pl: |
|
204 | 225 | self.read() |
|
205 | 226 | return self.pl |
|
206 | 227 | |
|
207 | 228 | def setparents(self, p1, p2 = nullid): |
|
208 | 229 | self.dirty = 1 |
|
209 | 230 | self.pl = p1, p2 |
|
210 | 231 | |
|
211 | 232 | def state(self, key): |
|
212 | 233 | try: |
|
213 | 234 | return self[key][0] |
|
214 | 235 | except KeyError: |
|
215 | 236 | return "?" |
|
216 | 237 | |
|
217 | 238 | def read(self): |
|
218 | 239 | if self.map is not None: return self.map |
|
219 | 240 | |
|
220 | 241 | self.map = {} |
|
221 | 242 | self.pl = [nullid, nullid] |
|
222 | 243 | try: |
|
223 | 244 | st = self.opener("dirstate").read() |
|
224 | 245 | if not st: return |
|
225 | 246 | except: return |
|
226 | 247 | |
|
227 | 248 | self.pl = [st[:20], st[20: 40]] |
|
228 | 249 | |
|
229 | 250 | pos = 40 |
|
230 | 251 | while pos < len(st): |
|
231 | 252 | e = struct.unpack(">cllll", st[pos:pos+17]) |
|
232 | 253 | l = e[4] |
|
233 | 254 | pos += 17 |
|
234 | 255 | f = st[pos:pos + l] |
|
235 | 256 | self.map[f] = e[:4] |
|
236 | 257 | pos += l |
|
237 | 258 | |
|
238 | 259 | def update(self, files, state): |
|
239 | 260 | ''' current states: |
|
240 | 261 | n normal |
|
241 | 262 | m needs merging |
|
242 | 263 | r marked for removal |
|
243 | 264 | a marked for addition''' |
|
244 | 265 | |
|
245 | 266 | if not files: return |
|
246 | 267 | self.read() |
|
247 | 268 | self.dirty = 1 |
|
248 | 269 | for f in files: |
|
249 | 270 | if state == "r": |
|
250 | 271 | self.map[f] = ('r', 0, 0, 0) |
|
251 | 272 | else: |
|
252 | 273 | s = os.stat(os.path.join(self.root, f)) |
|
253 | 274 | self.map[f] = (state, s.st_mode, s.st_size, s.st_mtime) |
|
254 | 275 | |
|
255 | 276 | def forget(self, files): |
|
256 | 277 | if not files: return |
|
257 | 278 | self.read() |
|
258 | 279 | self.dirty = 1 |
|
259 | 280 | for f in files: |
|
260 | 281 | try: |
|
261 | 282 | del self.map[f] |
|
262 | 283 | except KeyError: |
|
263 | 284 | self.ui.warn("not in dirstate: %s!\n" % f) |
|
264 | 285 | pass |
|
265 | 286 | |
|
266 | 287 | def clear(self): |
|
267 | 288 | self.map = {} |
|
268 | 289 | self.dirty = 1 |
|
269 | 290 | |
|
270 | 291 | def write(self): |
|
271 | 292 | st = self.opener("dirstate", "w") |
|
272 | 293 | st.write("".join(self.pl)) |
|
273 | 294 | for f, e in self.map.items(): |
|
274 | 295 | e = struct.pack(">cllll", e[0], e[1], e[2], e[3], len(f)) |
|
275 | 296 | st.write(e + f) |
|
276 | 297 | self.dirty = 0 |
|
277 | 298 | |
|
278 | 299 | def copy(self): |
|
279 | 300 | self.read() |
|
280 | 301 | return self.map.copy() |
|
281 | 302 | |
|
282 | 303 | # used to avoid circular references so destructors work |
|
283 | 304 | def opener(base): |
|
284 | 305 | p = base |
|
285 | 306 | def o(path, mode="r"): |
|
286 | 307 | if p[:7] == "http://": |
|
287 | 308 | f = os.path.join(p, urllib.quote(path)) |
|
288 | 309 | return httprangereader(f) |
|
289 | 310 | |
|
290 | 311 | f = os.path.join(p, path) |
|
291 | 312 | |
|
292 | 313 | mode += "b" # for that other OS |
|
293 | 314 | |
|
294 | 315 | if mode[0] != "r": |
|
295 | 316 | try: |
|
296 | 317 | s = os.stat(f) |
|
297 | 318 | except OSError: |
|
298 | 319 | d = os.path.dirname(f) |
|
299 | 320 | if not os.path.isdir(d): |
|
300 | 321 | os.makedirs(d) |
|
301 | 322 | else: |
|
302 | 323 | if s.st_nlink > 1: |
|
303 | 324 | file(f + ".tmp", "w").write(file(f).read()) |
|
304 | 325 | os.rename(f+".tmp", f) |
|
305 | 326 | |
|
306 | 327 | return file(f, mode) |
|
307 | 328 | |
|
308 | 329 | return o |
|
309 | 330 | |
|
310 | 331 | class localrepository: |
|
311 | 332 | def __init__(self, ui, path=None, create=0): |
|
312 | 333 | self.remote = 0 |
|
313 | 334 | if path and path[:7] == "http://": |
|
314 | 335 | self.remote = 1 |
|
315 | 336 | self.path = path |
|
316 | 337 | else: |
|
317 | 338 | if not path: |
|
318 | 339 | p = os.getcwd() |
|
319 | 340 | while not os.path.isdir(os.path.join(p, ".hg")): |
|
320 | 341 | p = os.path.dirname(p) |
|
321 | 342 | if p == "/": raise "No repo found" |
|
322 | 343 | path = p |
|
323 | 344 | self.path = os.path.join(path, ".hg") |
|
324 | 345 | |
|
325 | 346 | self.root = path |
|
326 | 347 | self.ui = ui |
|
327 | 348 | |
|
328 | 349 | if create: |
|
329 | 350 | os.mkdir(self.path) |
|
330 | 351 | os.mkdir(self.join("data")) |
|
331 | 352 | |
|
332 | 353 | self.opener = opener(self.path) |
|
333 | 354 | self.wopener = opener(self.root) |
|
334 | 355 | self.manifest = manifest(self.opener) |
|
335 | 356 | self.changelog = changelog(self.opener) |
|
336 | 357 | self.ignorelist = None |
|
337 | 358 | self.tagscache = None |
|
338 | 359 | self.nodetagscache = None |
|
339 | 360 | |
|
340 | 361 | if not self.remote: |
|
341 | 362 | self.dirstate = dirstate(self.opener, ui, self.root) |
|
342 | 363 | try: |
|
343 | 364 | self.ui.readconfig(self.opener("hgrc")) |
|
344 | 365 | except IOError: pass |
|
345 | 366 | |
|
346 | 367 | def ignore(self, f): |
|
347 | 368 | if self.ignorelist is None: |
|
348 | 369 | self.ignorelist = [] |
|
349 | 370 | try: |
|
350 | 371 | l = self.wfile(".hgignore") |
|
351 | 372 | for pat in l: |
|
352 | 373 | if pat != "\n": |
|
353 | 374 | self.ignorelist.append(re.compile(pat[:-1])) |
|
354 | 375 | except IOError: pass |
|
355 | 376 | for pat in self.ignorelist: |
|
356 | 377 | if pat.search(f): return True |
|
357 | 378 | return False |
|
358 | 379 | |
|
359 | 380 | def tags(self): |
|
360 | 381 | '''return a mapping of tag to node''' |
|
361 | 382 | if not self.tagscache: |
|
362 | 383 | self.tagscache = {} |
|
363 | 384 | try: |
|
364 | 385 | # read each head of the tags file, ending with the tip |
|
365 | 386 | # and add each tag found to the map, with "newer" ones |
|
366 | 387 | # taking precedence |
|
367 | 388 | fl = self.file(".hgtags") |
|
368 | 389 | h = fl.heads() |
|
369 | 390 | h.reverse() |
|
370 | 391 | for r in h: |
|
371 | 392 | for l in fl.revision(r).splitlines(): |
|
372 | 393 | if l: |
|
373 | 394 | n, k = l.split(" ") |
|
374 | 395 | self.tagscache[k] = bin(n) |
|
375 | 396 | except KeyError: pass |
|
376 | 397 | self.tagscache['tip'] = self.changelog.tip() |
|
377 | 398 | |
|
378 | 399 | return self.tagscache |
|
379 | 400 | |
|
380 | 401 | def tagslist(self): |
|
381 | 402 | '''return a list of tags ordered by revision''' |
|
382 | 403 | l = [] |
|
383 | 404 | for t,n in self.tags().items(): |
|
384 | 405 | try: |
|
385 | 406 | r = self.changelog.rev(n) |
|
386 | 407 | except: |
|
387 | 408 | r = -2 # sort to the beginning of the list if unknown |
|
388 | 409 | l.append((r,t,n)) |
|
389 | 410 | l.sort() |
|
390 | 411 | return [(t,n) for r,t,n in l] |
|
391 | 412 | |
|
392 | 413 | def nodetags(self, node): |
|
393 | 414 | '''return the tags associated with a node''' |
|
394 | 415 | if not self.nodetagscache: |
|
395 | 416 | self.nodetagscache = {} |
|
396 | 417 | for t,n in self.tags().items(): |
|
397 | 418 | self.nodetagscache.setdefault(n,[]).append(t) |
|
398 | 419 | return self.nodetagscache.get(node, []) |
|
399 | 420 | |
|
400 | 421 | def lookup(self, key): |
|
401 | 422 | try: |
|
402 | 423 | return self.tags()[key] |
|
403 | 424 | except KeyError: |
|
404 | 425 | return self.changelog.lookup(key) |
|
405 | 426 | |
|
406 | 427 | def join(self, f): |
|
407 | 428 | return os.path.join(self.path, f) |
|
408 | 429 | |
|
409 | 430 | def wjoin(self, f): |
|
410 | 431 | return os.path.join(self.root, f) |
|
411 | 432 | |
|
412 | 433 | def file(self, f): |
|
413 | 434 | if f[0] == '/': f = f[1:] |
|
414 | 435 | return filelog(self.opener, f) |
|
415 | 436 | |
|
416 | 437 | def wfile(self, f, mode='r'): |
|
417 | 438 | return self.wopener(f, mode) |
|
418 | 439 | |
|
419 | 440 | def transaction(self): |
|
420 | 441 | # save dirstate for undo |
|
421 | 442 | try: |
|
422 | 443 | ds = self.opener("dirstate").read() |
|
423 | 444 | except IOError: |
|
424 | 445 | ds = "" |
|
425 | 446 | self.opener("undo.dirstate", "w").write(ds) |
|
426 | 447 | |
|
427 | 448 | return transaction.transaction(self.opener, self.join("journal"), |
|
428 | 449 | self.join("undo")) |
|
429 | 450 | |
|
430 | 451 | def recover(self): |
|
431 | 452 | lock = self.lock() |
|
432 | 453 | if os.path.exists(self.join("recover")): |
|
433 | 454 | self.ui.status("attempting to rollback interrupted transaction\n") |
|
434 | 455 | return transaction.rollback(self.opener, self.join("recover")) |
|
435 | 456 | else: |
|
436 | 457 | self.ui.warn("no interrupted transaction available\n") |
|
437 | 458 | |
|
438 | 459 | def undo(self): |
|
439 | 460 | lock = self.lock() |
|
440 | 461 | if os.path.exists(self.join("undo")): |
|
441 | 462 | self.ui.status("attempting to rollback last transaction\n") |
|
442 | 463 | transaction.rollback(self.opener, self.join("undo")) |
|
443 | 464 | self.dirstate = None |
|
444 | 465 | os.rename(self.join("undo.dirstate"), self.join("dirstate")) |
|
445 | 466 | self.dirstate = dirstate(self.opener, self.ui, self.root) |
|
446 | 467 | else: |
|
447 | 468 | self.ui.warn("no undo information available\n") |
|
448 | 469 | |
|
449 | 470 | def lock(self, wait = 1): |
|
450 | 471 | try: |
|
451 | 472 | return lock.lock(self.join("lock"), 0) |
|
452 | 473 | except lock.LockHeld, inst: |
|
453 | 474 | if wait: |
|
454 | 475 | self.ui.warn("waiting for lock held by %s\n" % inst.args[0]) |
|
455 | 476 | return lock.lock(self.join("lock"), wait) |
|
456 | 477 | raise inst |
|
457 | 478 | |
|
458 | 479 | def rawcommit(self, files, text, user, date, p1=None, p2=None): |
|
459 | 480 | p1 = p1 or self.dirstate.parents()[0] or nullid |
|
460 | 481 | p2 = p2 or self.dirstate.parents()[1] or nullid |
|
461 | 482 | c1 = self.changelog.read(p1) |
|
462 | 483 | c2 = self.changelog.read(p2) |
|
463 | 484 | m1 = self.manifest.read(c1[0]) |
|
464 | 485 | mf1 = self.manifest.readflags(c1[0]) |
|
465 | 486 | m2 = self.manifest.read(c2[0]) |
|
466 | 487 | |
|
467 | 488 | tr = self.transaction() |
|
468 | 489 | mm = m1.copy() |
|
469 | 490 | mfm = mf1.copy() |
|
470 | 491 | linkrev = self.changelog.count() |
|
471 | 492 | self.dirstate.setparents(p1, p2) |
|
472 | 493 | for f in files: |
|
473 | 494 | try: |
|
474 | 495 | t = self.wfile(f).read() |
|
475 | 496 | tm = is_exec(self.wjoin(f)) |
|
476 | 497 | r = self.file(f) |
|
477 | 498 | mfm[f] = tm |
|
478 | mm[f] = r.add(t, tr, linkrev, | |
|
499 | mm[f] = r.add(t, {}, tr, linkrev, | |
|
479 | 500 | m1.get(f, nullid), m2.get(f, nullid)) |
|
480 | 501 | self.dirstate.update([f], "n") |
|
481 | 502 | except IOError: |
|
482 | 503 | try: |
|
483 | 504 | del mm[f] |
|
484 | 505 | del mfm[f] |
|
485 | 506 | self.dirstate.forget([f]) |
|
486 | 507 | except: |
|
487 | 508 | # deleted from p2? |
|
488 | 509 | pass |
|
489 | 510 | |
|
490 | 511 | mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0]) |
|
491 | 512 | n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date) |
|
492 | 513 | tr.close() |
|
493 | 514 | |
|
494 | 515 | def commit(self, files = None, text = "", user = None, date = None): |
|
495 | 516 | commit = [] |
|
496 | 517 | remove = [] |
|
497 | 518 | if files: |
|
498 | 519 | for f in files: |
|
499 | 520 | s = self.dirstate.state(f) |
|
500 | 521 | if s in 'nmai': |
|
501 | 522 | commit.append(f) |
|
502 | 523 | elif s == 'r': |
|
503 | 524 | remove.append(f) |
|
504 | 525 | else: |
|
505 | 526 | self.ui.warn("%s not tracked!\n" % f) |
|
506 | 527 | else: |
|
507 | 528 | (c, a, d, u) = self.diffdir(self.root) |
|
508 | 529 | commit = c + a |
|
509 | 530 | remove = d |
|
510 | 531 | |
|
511 | 532 | if not commit and not remove: |
|
512 | 533 | self.ui.status("nothing changed\n") |
|
513 | 534 | return |
|
514 | 535 | |
|
515 | 536 | p1, p2 = self.dirstate.parents() |
|
516 | 537 | c1 = self.changelog.read(p1) |
|
517 | 538 | c2 = self.changelog.read(p2) |
|
518 | 539 | m1 = self.manifest.read(c1[0]) |
|
519 | 540 | mf1 = self.manifest.readflags(c1[0]) |
|
520 | 541 | m2 = self.manifest.read(c2[0]) |
|
521 | 542 | lock = self.lock() |
|
522 | 543 | tr = self.transaction() |
|
523 | 544 | |
|
524 | 545 | # check in files |
|
525 | 546 | new = {} |
|
526 | 547 | linkrev = self.changelog.count() |
|
527 | 548 | commit.sort() |
|
528 | 549 | for f in commit: |
|
529 | 550 | self.ui.note(f + "\n") |
|
530 | 551 | try: |
|
531 | 552 | fp = self.wjoin(f) |
|
532 | 553 | mf1[f] = is_exec(fp) |
|
533 | 554 | t = file(fp).read() |
|
534 | 555 | except IOError: |
|
535 | 556 | self.warn("trouble committing %s!\n" % f) |
|
536 | 557 | raise |
|
537 | 558 | |
|
538 | 559 | r = self.file(f) |
|
539 | 560 | fp1 = m1.get(f, nullid) |
|
540 | 561 | fp2 = m2.get(f, nullid) |
|
541 | new[f] = r.add(t, tr, linkrev, fp1, fp2) | |
|
562 | new[f] = r.add(t, {}, tr, linkrev, fp1, fp2) | |
|
542 | 563 | |
|
543 | 564 | # update manifest |
|
544 | 565 | m1.update(new) |
|
545 | 566 | for f in remove: del m1[f] |
|
546 | 567 | mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0]) |
|
547 | 568 | |
|
548 | 569 | # add changeset |
|
549 | 570 | new = new.keys() |
|
550 | 571 | new.sort() |
|
551 | 572 | |
|
552 | 573 | if not text: |
|
553 | 574 | edittext = "\n" + "HG: manifest hash %s\n" % hex(mn) |
|
554 | 575 | edittext += "".join(["HG: changed %s\n" % f for f in new]) |
|
555 | 576 | edittext += "".join(["HG: removed %s\n" % f for f in remove]) |
|
556 | 577 | edittext = self.ui.edit(edittext) |
|
557 | 578 | if not edittext.rstrip(): |
|
558 | 579 | return 1 |
|
559 | 580 | text = edittext |
|
560 | 581 | |
|
561 | 582 | n = self.changelog.add(mn, new, text, tr, p1, p2, user, date) |
|
562 | 583 | tr.close() |
|
563 | 584 | |
|
564 | 585 | self.dirstate.setparents(n) |
|
565 | 586 | self.dirstate.update(new, "n") |
|
566 | 587 | self.dirstate.forget(remove) |
|
567 | 588 | |
|
568 | 589 | def diffdir(self, path, changeset = None): |
|
569 | 590 | changed = [] |
|
570 | 591 | added = [] |
|
571 | 592 | unknown = [] |
|
572 | 593 | mf = {} |
|
573 | 594 | |
|
574 | 595 | if changeset: |
|
575 | 596 | change = self.changelog.read(changeset) |
|
576 | 597 | mf = self.manifest.read(change[0]) |
|
577 | 598 | dc = dict.fromkeys(mf) |
|
578 | 599 | else: |
|
579 | 600 | changeset = self.dirstate.parents()[0] |
|
580 | 601 | change = self.changelog.read(changeset) |
|
581 | 602 | mf = self.manifest.read(change[0]) |
|
582 | 603 | dc = self.dirstate.copy() |
|
583 | 604 | |
|
584 | 605 | def fcmp(fn): |
|
585 | 606 | t1 = self.wfile(fn).read() |
|
586 | 607 | t2 = self.file(fn).revision(mf[fn]) |
|
587 | 608 | return cmp(t1, t2) |
|
588 | 609 | |
|
589 | 610 | for dir, subdirs, files in os.walk(path): |
|
590 | 611 | d = dir[len(self.root)+1:] |
|
591 | 612 | if ".hg" in subdirs: subdirs.remove(".hg") |
|
592 | 613 | |
|
593 | 614 | for f in files: |
|
594 | 615 | fn = os.path.join(d, f) |
|
595 | 616 | try: s = os.stat(os.path.join(self.root, fn)) |
|
596 | 617 | except: continue |
|
597 | 618 | if fn in dc: |
|
598 | 619 | c = dc[fn] |
|
599 | 620 | del dc[fn] |
|
600 | 621 | if not c: |
|
601 | 622 | if fcmp(fn): |
|
602 | 623 | changed.append(fn) |
|
603 | 624 | elif c[0] == 'm': |
|
604 | 625 | changed.append(fn) |
|
605 | 626 | elif c[0] == 'a': |
|
606 | 627 | added.append(fn) |
|
607 | 628 | elif c[0] == 'r': |
|
608 | 629 | unknown.append(fn) |
|
609 | 630 | elif c[2] != s.st_size or (c[1] ^ s.st_mode) & 0100: |
|
610 | 631 | changed.append(fn) |
|
611 | 632 | elif c[1] != s.st_mode or c[3] != s.st_mtime: |
|
612 | 633 | if fcmp(fn): |
|
613 | 634 | changed.append(fn) |
|
614 | 635 | else: |
|
615 | 636 | if self.ignore(fn): continue |
|
616 | 637 | unknown.append(fn) |
|
617 | 638 | |
|
618 | 639 | deleted = dc.keys() |
|
619 | 640 | deleted.sort() |
|
620 | 641 | |
|
621 | 642 | return (changed, added, deleted, unknown) |
|
622 | 643 | |
|
623 | 644 | def diffrevs(self, node1, node2): |
|
624 | 645 | changed, added = [], [] |
|
625 | 646 | |
|
626 | 647 | change = self.changelog.read(node1) |
|
627 | 648 | mf1 = self.manifest.read(change[0]) |
|
628 | 649 | change = self.changelog.read(node2) |
|
629 | 650 | mf2 = self.manifest.read(change[0]) |
|
630 | 651 | |
|
631 | 652 | for fn in mf2: |
|
632 | 653 | if mf1.has_key(fn): |
|
633 | 654 | if mf1[fn] != mf2[fn]: |
|
634 | 655 | changed.append(fn) |
|
635 | 656 | del mf1[fn] |
|
636 | 657 | else: |
|
637 | 658 | added.append(fn) |
|
638 | 659 | |
|
639 | 660 | deleted = mf1.keys() |
|
640 | 661 | deleted.sort() |
|
641 | 662 | |
|
642 | 663 | return (changed, added, deleted) |
|
643 | 664 | |
|
644 | 665 | def add(self, list): |
|
645 | 666 | for f in list: |
|
646 | 667 | p = self.wjoin(f) |
|
647 | 668 | if not os.path.isfile(p): |
|
648 | 669 | self.ui.warn("%s does not exist!\n" % f) |
|
649 | 670 | elif self.dirstate.state(f) == 'n': |
|
650 | 671 | self.ui.warn("%s already tracked!\n" % f) |
|
651 | 672 | else: |
|
652 | 673 | self.dirstate.update([f], "a") |
|
653 | 674 | |
|
654 | 675 | def forget(self, list): |
|
655 | 676 | for f in list: |
|
656 | 677 | if self.dirstate.state(f) not in 'ai': |
|
657 | 678 | self.ui.warn("%s not added!\n" % f) |
|
658 | 679 | else: |
|
659 | 680 | self.dirstate.forget([f]) |
|
660 | 681 | |
|
661 | 682 | def remove(self, list): |
|
662 | 683 | for f in list: |
|
663 | 684 | p = self.wjoin(f) |
|
664 | 685 | if os.path.isfile(p): |
|
665 | 686 | self.ui.warn("%s still exists!\n" % f) |
|
666 | 687 | elif f not in self.dirstate: |
|
667 | 688 | self.ui.warn("%s not tracked!\n" % f) |
|
668 | 689 | else: |
|
669 | 690 | self.dirstate.update([f], "r") |
|
670 | 691 | |
|
671 | 692 | def heads(self): |
|
672 | 693 | return self.changelog.heads() |
|
673 | 694 | |
|
674 | 695 | def branches(self, nodes): |
|
675 | 696 | if not nodes: nodes = [self.changelog.tip()] |
|
676 | 697 | b = [] |
|
677 | 698 | for n in nodes: |
|
678 | 699 | t = n |
|
679 | 700 | while n: |
|
680 | 701 | p = self.changelog.parents(n) |
|
681 | 702 | if p[1] != nullid or p[0] == nullid: |
|
682 | 703 | b.append((t, n, p[0], p[1])) |
|
683 | 704 | break |
|
684 | 705 | n = p[0] |
|
685 | 706 | return b |
|
686 | 707 | |
|
687 | 708 | def between(self, pairs): |
|
688 | 709 | r = [] |
|
689 | 710 | |
|
690 | 711 | for top, bottom in pairs: |
|
691 | 712 | n, l, i = top, [], 0 |
|
692 | 713 | f = 1 |
|
693 | 714 | |
|
694 | 715 | while n != bottom: |
|
695 | 716 | p = self.changelog.parents(n)[0] |
|
696 | 717 | if i == f: |
|
697 | 718 | l.append(n) |
|
698 | 719 | f = f * 2 |
|
699 | 720 | n = p |
|
700 | 721 | i += 1 |
|
701 | 722 | |
|
702 | 723 | r.append(l) |
|
703 | 724 | |
|
704 | 725 | return r |
|
705 | 726 | |
|
706 | 727 | def newer(self, nodes): |
|
707 | 728 | m = {} |
|
708 | 729 | nl = [] |
|
709 | 730 | pm = {} |
|
710 | 731 | cl = self.changelog |
|
711 | 732 | t = l = cl.count() |
|
712 | 733 | |
|
713 | 734 | # find the lowest numbered node |
|
714 | 735 | for n in nodes: |
|
715 | 736 | l = min(l, cl.rev(n)) |
|
716 | 737 | m[n] = 1 |
|
717 | 738 | |
|
718 | 739 | for i in xrange(l, t): |
|
719 | 740 | n = cl.node(i) |
|
720 | 741 | if n in m: # explicitly listed |
|
721 | 742 | pm[n] = 1 |
|
722 | 743 | nl.append(n) |
|
723 | 744 | continue |
|
724 | 745 | for p in cl.parents(n): |
|
725 | 746 | if p in pm: # parent listed |
|
726 | 747 | pm[n] = 1 |
|
727 | 748 | nl.append(n) |
|
728 | 749 | break |
|
729 | 750 | |
|
730 | 751 | return nl |
|
731 | 752 | |
|
732 | 753 | def getchangegroup(self, remote): |
|
733 | 754 | m = self.changelog.nodemap |
|
734 | 755 | search = [] |
|
735 | 756 | fetch = [] |
|
736 | 757 | seen = {} |
|
737 | 758 | seenbranch = {} |
|
738 | 759 | |
|
739 | 760 | # if we have an empty repo, fetch everything |
|
740 | 761 | if self.changelog.tip() == nullid: |
|
741 | 762 | self.ui.status("requesting all changes\n") |
|
742 | 763 | return remote.changegroup([nullid]) |
|
743 | 764 | |
|
744 | 765 | # otherwise, assume we're closer to the tip than the root |
|
745 | 766 | self.ui.status("searching for changes\n") |
|
746 | 767 | heads = remote.heads() |
|
747 | 768 | unknown = [] |
|
748 | 769 | for h in heads: |
|
749 | 770 | if h not in m: |
|
750 | 771 | unknown.append(h) |
|
751 | 772 | |
|
752 | 773 | if not unknown: |
|
753 | 774 | self.ui.status("nothing to do!\n") |
|
754 | 775 | return None |
|
755 | 776 | |
|
756 | 777 | rep = {} |
|
757 | 778 | reqcnt = 0 |
|
758 | 779 | |
|
759 | 780 | unknown = remote.branches(unknown) |
|
760 | 781 | while unknown: |
|
761 | 782 | r = [] |
|
762 | 783 | while unknown: |
|
763 | 784 | n = unknown.pop(0) |
|
764 | 785 | if n[0] in seen: |
|
765 | 786 | continue |
|
766 | 787 | |
|
767 | 788 | self.ui.debug("examining %s:%s\n" % (short(n[0]), short(n[1]))) |
|
768 | 789 | if n[0] == nullid: |
|
769 | 790 | break |
|
770 | 791 | if n in seenbranch: |
|
771 | 792 | self.ui.debug("branch already found\n") |
|
772 | 793 | continue |
|
773 | 794 | if n[1] and n[1] in m: # do we know the base? |
|
774 | 795 | self.ui.debug("found incomplete branch %s:%s\n" |
|
775 | 796 | % (short(n[0]), short(n[1]))) |
|
776 | 797 | search.append(n) # schedule branch range for scanning |
|
777 | 798 | seenbranch[n] = 1 |
|
778 | 799 | else: |
|
779 | 800 | if n[1] not in seen and n[1] not in fetch: |
|
780 | 801 | if n[2] in m and n[3] in m: |
|
781 | 802 | self.ui.debug("found new changeset %s\n" % |
|
782 | 803 | short(n[1])) |
|
783 | 804 | fetch.append(n[1]) # earliest unknown |
|
784 | 805 | continue |
|
785 | 806 | |
|
786 | 807 | for a in n[2:4]: |
|
787 | 808 | if a not in rep: |
|
788 | 809 | r.append(a) |
|
789 | 810 | rep[a] = 1 |
|
790 | 811 | |
|
791 | 812 | seen[n[0]] = 1 |
|
792 | 813 | |
|
793 | 814 | if r: |
|
794 | 815 | reqcnt += 1 |
|
795 | 816 | self.ui.debug("request %d: %s\n" % |
|
796 | 817 | (reqcnt, " ".join(map(short, r)))) |
|
797 | 818 | for p in range(0, len(r), 10): |
|
798 | 819 | for b in remote.branches(r[p:p+10]): |
|
799 | 820 | self.ui.debug("received %s:%s\n" % |
|
800 | 821 | (short(b[0]), short(b[1]))) |
|
801 | 822 | if b[0] not in m and b[0] not in seen: |
|
802 | 823 | unknown.append(b) |
|
803 | 824 | |
|
804 | 825 | while search: |
|
805 | 826 | n = search.pop(0) |
|
806 | 827 | reqcnt += 1 |
|
807 | 828 | l = remote.between([(n[0], n[1])])[0] |
|
808 | 829 | l.append(n[1]) |
|
809 | 830 | p = n[0] |
|
810 | 831 | f = 1 |
|
811 | 832 | for i in l: |
|
812 | 833 | self.ui.debug("narrowing %d:%d %s\n" % (f, len(l), short(i))) |
|
813 | 834 | if i in m: |
|
814 | 835 | if f <= 2: |
|
815 | 836 | self.ui.debug("found new branch changeset %s\n" % |
|
816 | 837 | short(p)) |
|
817 | 838 | fetch.append(p) |
|
818 | 839 | else: |
|
819 | 840 | self.ui.debug("narrowed branch search to %s:%s\n" |
|
820 | 841 | % (short(p), short(i))) |
|
821 | 842 | search.append((p, i)) |
|
822 | 843 | break |
|
823 | 844 | p, f = i, f * 2 |
|
824 | 845 | |
|
825 | 846 | for f in fetch: |
|
826 | 847 | if f in m: |
|
827 | 848 | raise "already have", short(f[:4]) |
|
828 | 849 | |
|
829 | 850 | self.ui.note("adding new changesets starting at " + |
|
830 | 851 | " ".join([short(f) for f in fetch]) + "\n") |
|
831 | 852 | |
|
832 | 853 | self.ui.debug("%d total queries\n" % reqcnt) |
|
833 | 854 | |
|
834 | 855 | return remote.changegroup(fetch) |
|
835 | 856 | |
|
836 | 857 | def changegroup(self, basenodes): |
|
837 | 858 | nodes = self.newer(basenodes) |
|
838 | 859 | |
|
839 | 860 | # construct the link map |
|
840 | 861 | linkmap = {} |
|
841 | 862 | for n in nodes: |
|
842 | 863 | linkmap[self.changelog.rev(n)] = n |
|
843 | 864 | |
|
844 | 865 | # construct a list of all changed files |
|
845 | 866 | changed = {} |
|
846 | 867 | for n in nodes: |
|
847 | 868 | c = self.changelog.read(n) |
|
848 | 869 | for f in c[3]: |
|
849 | 870 | changed[f] = 1 |
|
850 | 871 | changed = changed.keys() |
|
851 | 872 | changed.sort() |
|
852 | 873 | |
|
853 | 874 | # the changegroup is changesets + manifests + all file revs |
|
854 | 875 | revs = [ self.changelog.rev(n) for n in nodes ] |
|
855 | 876 | |
|
856 | 877 | for y in self.changelog.group(linkmap): yield y |
|
857 | 878 | for y in self.manifest.group(linkmap): yield y |
|
858 | 879 | for f in changed: |
|
859 | 880 | yield struct.pack(">l", len(f) + 4) + f |
|
860 | 881 | g = self.file(f).group(linkmap) |
|
861 | 882 | for y in g: |
|
862 | 883 | yield y |
|
863 | 884 | |
|
864 | 885 | def addchangegroup(self, generator): |
|
865 | 886 | |
|
866 | 887 | class genread: |
|
867 | 888 | def __init__(self, generator): |
|
868 | 889 | self.g = generator |
|
869 | 890 | self.buf = "" |
|
870 | 891 | def read(self, l): |
|
871 | 892 | while l > len(self.buf): |
|
872 | 893 | try: |
|
873 | 894 | self.buf += self.g.next() |
|
874 | 895 | except StopIteration: |
|
875 | 896 | break |
|
876 | 897 | d, self.buf = self.buf[:l], self.buf[l:] |
|
877 | 898 | return d |
|
878 | 899 | |
|
879 | 900 | def getchunk(): |
|
880 | 901 | d = source.read(4) |
|
881 | 902 | if not d: return "" |
|
882 | 903 | l = struct.unpack(">l", d)[0] |
|
883 | 904 | if l <= 4: return "" |
|
884 | 905 | return source.read(l - 4) |
|
885 | 906 | |
|
886 | 907 | def getgroup(): |
|
887 | 908 | while 1: |
|
888 | 909 | c = getchunk() |
|
889 | 910 | if not c: break |
|
890 | 911 | yield c |
|
891 | 912 | |
|
892 | 913 | def csmap(x): |
|
893 | 914 | self.ui.debug("add changeset %s\n" % short(x)) |
|
894 | 915 | return self.changelog.count() |
|
895 | 916 | |
|
896 | 917 | def revmap(x): |
|
897 | 918 | return self.changelog.rev(x) |
|
898 | 919 | |
|
899 | 920 | if not generator: return |
|
900 | 921 | changesets = files = revisions = 0 |
|
901 | 922 | |
|
902 | 923 | source = genread(generator) |
|
903 | 924 | lock = self.lock() |
|
904 | 925 | tr = self.transaction() |
|
905 | 926 | |
|
906 | 927 | # pull off the changeset group |
|
907 | 928 | self.ui.status("adding changesets\n") |
|
908 | 929 | co = self.changelog.tip() |
|
909 | 930 | cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique |
|
910 | 931 | changesets = self.changelog.rev(cn) - self.changelog.rev(co) |
|
911 | 932 | |
|
912 | 933 | # pull off the manifest group |
|
913 | 934 | self.ui.status("adding manifests\n") |
|
914 | 935 | mm = self.manifest.tip() |
|
915 | 936 | mo = self.manifest.addgroup(getgroup(), revmap, tr) |
|
916 | 937 | |
|
917 | 938 | # process the files |
|
918 | 939 | self.ui.status("adding file revisions\n") |
|
919 | 940 | while 1: |
|
920 | 941 | f = getchunk() |
|
921 | 942 | if not f: break |
|
922 | 943 | self.ui.debug("adding %s revisions\n" % f) |
|
923 | 944 | fl = self.file(f) |
|
924 | 945 | o = fl.tip() |
|
925 | 946 | n = fl.addgroup(getgroup(), revmap, tr) |
|
926 | 947 | revisions += fl.rev(n) - fl.rev(o) |
|
927 | 948 | files += 1 |
|
928 | 949 | |
|
929 | 950 | self.ui.status(("modified %d files, added %d changesets" + |
|
930 | 951 | " and %d new revisions\n") |
|
931 | 952 | % (files, changesets, revisions)) |
|
932 | 953 | |
|
933 | 954 | tr.close() |
|
934 | 955 | return |
|
935 | 956 | |
|
936 | 957 | def update(self, node, allow=False, force=False): |
|
937 | 958 | pl = self.dirstate.parents() |
|
938 | 959 | if not force and pl[1] != nullid: |
|
939 | 960 | self.ui.warn("aborting: outstanding uncommitted merges\n") |
|
940 | 961 | return |
|
941 | 962 | |
|
942 | 963 | p1, p2 = pl[0], node |
|
943 | 964 | pa = self.changelog.ancestor(p1, p2) |
|
944 | 965 | m1n = self.changelog.read(p1)[0] |
|
945 | 966 | m2n = self.changelog.read(p2)[0] |
|
946 | 967 | man = self.manifest.ancestor(m1n, m2n) |
|
947 | 968 | m1 = self.manifest.read(m1n) |
|
948 | 969 | mf1 = self.manifest.readflags(m1n) |
|
949 | 970 | m2 = self.manifest.read(m2n) |
|
950 | 971 | mf2 = self.manifest.readflags(m2n) |
|
951 | 972 | ma = self.manifest.read(man) |
|
952 | 973 | mfa = self.manifest.readflags(m2n) |
|
953 | 974 | |
|
954 | 975 | (c, a, d, u) = self.diffdir(self.root) |
|
955 | 976 | |
|
956 | 977 | # resolve the manifest to determine which files |
|
957 | 978 | # we care about merging |
|
958 | 979 | self.ui.note("resolving manifests\n") |
|
959 | 980 | self.ui.debug(" ancestor %s local %s remote %s\n" % |
|
960 | 981 | (short(man), short(m1n), short(m2n))) |
|
961 | 982 | |
|
962 | 983 | merge = {} |
|
963 | 984 | get = {} |
|
964 | 985 | remove = [] |
|
965 | 986 | mark = {} |
|
966 | 987 | |
|
967 | 988 | # construct a working dir manifest |
|
968 | 989 | mw = m1.copy() |
|
969 | 990 | mfw = mf1.copy() |
|
970 | 991 | for f in a + c + u: |
|
971 | 992 | mw[f] = "" |
|
972 | 993 | mfw[f] = is_exec(self.wjoin(f)) |
|
973 | 994 | for f in d: |
|
974 | 995 | if f in mw: del mw[f] |
|
975 | 996 | |
|
976 | 997 | for f, n in mw.iteritems(): |
|
977 | 998 | if f in m2: |
|
978 | 999 | s = 0 |
|
979 | 1000 | |
|
980 | 1001 | # are files different? |
|
981 | 1002 | if n != m2[f]: |
|
982 | 1003 | a = ma.get(f, nullid) |
|
983 | 1004 | # are both different from the ancestor? |
|
984 | 1005 | if n != a and m2[f] != a: |
|
985 | 1006 | self.ui.debug(" %s versions differ, resolve\n" % f) |
|
986 | 1007 | merge[f] = (m1.get(f, nullid), m2[f]) |
|
987 | 1008 | # merge executable bits |
|
988 | 1009 | # "if we changed or they changed, change in merge" |
|
989 | 1010 | a, b, c = mfa.get(f, 0), mfw[f], mf2[f] |
|
990 | 1011 | mode = ((a^b) | (a^c)) ^ a |
|
991 | 1012 | merge[f] = (m1.get(f, nullid), m2[f], mode) |
|
992 | 1013 | s = 1 |
|
993 | 1014 | # are we clobbering? |
|
994 | 1015 | # is remote's version newer? |
|
995 | 1016 | # or are we going back in time? |
|
996 | 1017 | elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]): |
|
997 | 1018 | self.ui.debug(" remote %s is newer, get\n" % f) |
|
998 | 1019 | get[f] = m2[f] |
|
999 | 1020 | s = 1 |
|
1000 | 1021 | else: |
|
1001 | 1022 | mark[f] = 1 |
|
1002 | 1023 | |
|
1003 | 1024 | if not s and mfw[f] != mf2[f]: |
|
1004 | 1025 | if force: |
|
1005 | 1026 | self.ui.debug(" updating permissions for %s\n" % f) |
|
1006 | 1027 | set_exec(self.wjoin(f), mf2[f]) |
|
1007 | 1028 | else: |
|
1008 | 1029 | a, b, c = mfa.get(f, 0), mfw[f], mf2[f] |
|
1009 | 1030 | mode = ((a^b) | (a^c)) ^ a |
|
1010 | 1031 | if mode != b: |
|
1011 | 1032 | self.ui.debug(" updating permissions for %s\n" % f) |
|
1012 | 1033 | set_exec(self.wjoin(f), mode) |
|
1013 | 1034 | mark[f] = 1 |
|
1014 | 1035 | del m2[f] |
|
1015 | 1036 | elif f in ma: |
|
1016 | 1037 | if not force and n != ma[f]: |
|
1017 | 1038 | r = self.ui.prompt( |
|
1018 | 1039 | (" local changed %s which remote deleted\n" % f) + |
|
1019 | 1040 | "(k)eep or (d)elete?", "[kd]", "k") |
|
1020 | 1041 | if r == "d": |
|
1021 | 1042 | remove.append(f) |
|
1022 | 1043 | else: |
|
1023 | 1044 | self.ui.debug("other deleted %s\n" % f) |
|
1024 | 1045 | remove.append(f) # other deleted it |
|
1025 | 1046 | else: |
|
1026 | 1047 | if n == m1.get(f, nullid): # same as parent |
|
1027 | 1048 | self.ui.debug("local created %s, keeping\n" % f) |
|
1028 | 1049 | else: |
|
1029 | 1050 | self.ui.debug("working dir created %s, keeping\n" % f) |
|
1030 | 1051 | |
|
1031 | 1052 | for f, n in m2.iteritems(): |
|
1032 | 1053 | if f[0] == "/": continue |
|
1033 | 1054 | if not force and f in ma and n != ma[f]: |
|
1034 | 1055 | r = self.ui.prompt( |
|
1035 | 1056 | ("remote changed %s which local deleted\n" % f) + |
|
1036 | 1057 | "(k)eep or (d)elete?", "[kd]", "k") |
|
1037 | 1058 | if r == "d": remove.append(f) |
|
1038 | 1059 | else: |
|
1039 | 1060 | self.ui.debug("remote created %s\n" % f) |
|
1040 | 1061 | get[f] = n |
|
1041 | 1062 | |
|
1042 | 1063 | del mw, m1, m2, ma |
|
1043 | 1064 | |
|
1044 | 1065 | if force: |
|
1045 | 1066 | for f in merge: |
|
1046 | 1067 | get[f] = merge[f][1] |
|
1047 | 1068 | merge = {} |
|
1048 | 1069 | |
|
1049 | 1070 | if pa == p1 or pa == p2: |
|
1050 | 1071 | # we don't need to do any magic, just jump to the new rev |
|
1051 | 1072 | mode = 'n' |
|
1052 | 1073 | p1, p2 = p2, nullid |
|
1053 | 1074 | else: |
|
1054 | 1075 | if not allow: |
|
1055 | 1076 | self.ui.status("this update spans a branch" + |
|
1056 | 1077 | " affecting the following files:\n") |
|
1057 | 1078 | fl = merge.keys() + get.keys() |
|
1058 | 1079 | fl.sort() |
|
1059 | 1080 | for f in fl: |
|
1060 | 1081 | cf = "" |
|
1061 | 1082 | if f in merge: cf = " (resolve)" |
|
1062 | 1083 | self.ui.status(" %s%s\n" % (f, cf)) |
|
1063 | 1084 | self.ui.warn("aborting update spanning branches!\n") |
|
1064 | 1085 | self.ui.status("(use update -m to perform a branch merge)\n") |
|
1065 | 1086 | return 1 |
|
1066 | 1087 | # we have to remember what files we needed to get/change |
|
1067 | 1088 | # because any file that's different from either one of its |
|
1068 | 1089 | # parents must be in the changeset |
|
1069 | 1090 | mode = 'm' |
|
1070 | 1091 | self.dirstate.update(mark.keys(), "m") |
|
1071 | 1092 | |
|
1072 | 1093 | self.dirstate.setparents(p1, p2) |
|
1073 | 1094 | |
|
1074 | 1095 | # get the files we don't need to change |
|
1075 | 1096 | files = get.keys() |
|
1076 | 1097 | files.sort() |
|
1077 | 1098 | for f in files: |
|
1078 | 1099 | if f[0] == "/": continue |
|
1079 | 1100 | self.ui.note("getting %s\n" % f) |
|
1080 | 1101 | t = self.file(f).read(get[f]) |
|
1081 | 1102 | try: |
|
1082 | 1103 | self.wfile(f, "w").write(t) |
|
1083 | 1104 | except IOError: |
|
1084 | 1105 | os.makedirs(os.path.dirname(self.wjoin(f))) |
|
1085 | 1106 | self.wfile(f, "w").write(t) |
|
1086 | 1107 | set_exec(self.wjoin(f), mf2[f]) |
|
1087 | 1108 | self.dirstate.update([f], mode) |
|
1088 | 1109 | |
|
1089 | 1110 | # merge the tricky bits |
|
1090 | 1111 | files = merge.keys() |
|
1091 | 1112 | files.sort() |
|
1092 | 1113 | for f in files: |
|
1093 | 1114 | self.ui.status("merging %s\n" % f) |
|
1094 | 1115 | m, o, flag = merge[f] |
|
1095 | 1116 | self.merge3(f, m, o) |
|
1096 | 1117 | set_exec(self.wjoin(f), flag) |
|
1097 | 1118 | self.dirstate.update([f], 'm') |
|
1098 | 1119 | |
|
1099 | 1120 | for f in remove: |
|
1100 | 1121 | self.ui.note("removing %s\n" % f) |
|
1101 | 1122 | os.unlink(f) |
|
1102 | 1123 | if mode == 'n': |
|
1103 | 1124 | self.dirstate.forget(remove) |
|
1104 | 1125 | else: |
|
1105 | 1126 | self.dirstate.update(remove, 'r') |
|
1106 | 1127 | |
|
1107 | 1128 | def merge3(self, fn, my, other): |
|
1108 | 1129 | """perform a 3-way merge in the working directory""" |
|
1109 | 1130 | |
|
1110 | 1131 | def temp(prefix, node): |
|
1111 | 1132 | pre = "%s~%s." % (os.path.basename(fn), prefix) |
|
1112 | 1133 | (fd, name) = tempfile.mkstemp("", pre) |
|
1113 | 1134 | f = os.fdopen(fd, "w") |
|
1114 | 1135 | f.write(fl.revision(node)) |
|
1115 | 1136 | f.close() |
|
1116 | 1137 | return name |
|
1117 | 1138 | |
|
1118 | 1139 | fl = self.file(fn) |
|
1119 | 1140 | base = fl.ancestor(my, other) |
|
1120 | 1141 | a = self.wjoin(fn) |
|
1121 | 1142 | b = temp("base", base) |
|
1122 | 1143 | c = temp("other", other) |
|
1123 | 1144 | |
|
1124 | 1145 | self.ui.note("resolving %s\n" % fn) |
|
1125 | 1146 | self.ui.debug("file %s: other %s ancestor %s\n" % |
|
1126 | 1147 | (fn, short(other), short(base))) |
|
1127 | 1148 | |
|
1128 | 1149 | cmd = os.environ.get("HGMERGE", "hgmerge") |
|
1129 | 1150 | r = os.system("%s %s %s %s" % (cmd, a, b, c)) |
|
1130 | 1151 | if r: |
|
1131 | 1152 | self.ui.warn("merging %s failed!\n" % fn) |
|
1132 | 1153 | |
|
1133 | 1154 | os.unlink(b) |
|
1134 | 1155 | os.unlink(c) |
|
1135 | 1156 | |
|
1136 | 1157 | def verify(self): |
|
1137 | 1158 | filelinkrevs = {} |
|
1138 | 1159 | filenodes = {} |
|
1139 | 1160 | changesets = revisions = files = 0 |
|
1140 | 1161 | errors = 0 |
|
1141 | 1162 | |
|
1142 | 1163 | seen = {} |
|
1143 | 1164 | self.ui.status("checking changesets\n") |
|
1144 | 1165 | for i in range(self.changelog.count()): |
|
1145 | 1166 | changesets += 1 |
|
1146 | 1167 | n = self.changelog.node(i) |
|
1147 | 1168 | if n in seen: |
|
1148 | 1169 | self.ui.warn("duplicate changeset at revision %d\n" % i) |
|
1149 | 1170 | errors += 1 |
|
1150 | 1171 | seen[n] = 1 |
|
1151 | 1172 | |
|
1152 | 1173 | for p in self.changelog.parents(n): |
|
1153 | 1174 | if p not in self.changelog.nodemap: |
|
1154 | 1175 | self.ui.warn("changeset %s has unknown parent %s\n" % |
|
1155 | 1176 | (short(n), short(p))) |
|
1156 | 1177 | errors += 1 |
|
1157 | 1178 | try: |
|
1158 | 1179 | changes = self.changelog.read(n) |
|
1159 | 1180 | except Exception, inst: |
|
1160 | 1181 | self.ui.warn("unpacking changeset %s: %s\n" % (short(n), inst)) |
|
1161 | 1182 | errors += 1 |
|
1162 | 1183 | |
|
1163 | 1184 | for f in changes[3]: |
|
1164 | 1185 | filelinkrevs.setdefault(f, []).append(i) |
|
1165 | 1186 | |
|
1166 | 1187 | seen = {} |
|
1167 | 1188 | self.ui.status("checking manifests\n") |
|
1168 | 1189 | for i in range(self.manifest.count()): |
|
1169 | 1190 | n = self.manifest.node(i) |
|
1170 | 1191 | if n in seen: |
|
1171 | 1192 | self.ui.warn("duplicate manifest at revision %d\n" % i) |
|
1172 | 1193 | errors += 1 |
|
1173 | 1194 | seen[n] = 1 |
|
1174 | 1195 | |
|
1175 | 1196 | for p in self.manifest.parents(n): |
|
1176 | 1197 | if p not in self.manifest.nodemap: |
|
1177 | 1198 | self.ui.warn("manifest %s has unknown parent %s\n" % |
|
1178 | 1199 | (short(n), short(p))) |
|
1179 | 1200 | errors += 1 |
|
1180 | 1201 | |
|
1181 | 1202 | try: |
|
1182 | 1203 | delta = mdiff.patchtext(self.manifest.delta(n)) |
|
1183 | 1204 | except KeyboardInterrupt: |
|
1184 | 1205 | print "aborted" |
|
1185 | 1206 | sys.exit(0) |
|
1186 | 1207 | except Exception, inst: |
|
1187 | 1208 | self.ui.warn("unpacking manifest %s: %s\n" |
|
1188 | 1209 | % (short(n), inst)) |
|
1189 | 1210 | errors += 1 |
|
1190 | 1211 | |
|
1191 | 1212 | ff = [ l.split('\0') for l in delta.splitlines() ] |
|
1192 | 1213 | for f, fn in ff: |
|
1193 | 1214 | filenodes.setdefault(f, {})[bin(fn[:40])] = 1 |
|
1194 | 1215 | |
|
1195 | 1216 | self.ui.status("crosschecking files in changesets and manifests\n") |
|
1196 | 1217 | for f in filenodes: |
|
1197 | 1218 | if f not in filelinkrevs: |
|
1198 | 1219 | self.ui.warn("file %s in manifest but not in changesets\n" % f) |
|
1199 | 1220 | errors += 1 |
|
1200 | 1221 | |
|
1201 | 1222 | for f in filelinkrevs: |
|
1202 | 1223 | if f not in filenodes: |
|
1203 | 1224 | self.ui.warn("file %s in changeset but not in manifest\n" % f) |
|
1204 | 1225 | errors += 1 |
|
1205 | 1226 | |
|
1206 | 1227 | self.ui.status("checking files\n") |
|
1207 | 1228 | ff = filenodes.keys() |
|
1208 | 1229 | ff.sort() |
|
1209 | 1230 | for f in ff: |
|
1210 | 1231 | if f == "/dev/null": continue |
|
1211 | 1232 | files += 1 |
|
1212 | 1233 | fl = self.file(f) |
|
1213 | 1234 | nodes = { nullid: 1 } |
|
1214 | 1235 | seen = {} |
|
1215 | 1236 | for i in range(fl.count()): |
|
1216 | 1237 | revisions += 1 |
|
1217 | 1238 | n = fl.node(i) |
|
1218 | 1239 | |
|
1219 | 1240 | if n in seen: |
|
1220 | 1241 | self.ui.warn("%s: duplicate revision %d\n" % (f, i)) |
|
1221 | 1242 | errors += 1 |
|
1222 | 1243 | |
|
1223 | 1244 | if n not in filenodes[f]: |
|
1224 | 1245 | self.ui.warn("%s: %d:%s not in manifests\n" |
|
1225 | 1246 | % (f, i, short(n))) |
|
1226 | 1247 | print len(filenodes[f].keys()), fl.count(), f |
|
1227 | 1248 | errors += 1 |
|
1228 | 1249 | else: |
|
1229 | 1250 | del filenodes[f][n] |
|
1230 | 1251 | |
|
1231 | 1252 | flr = fl.linkrev(n) |
|
1232 | 1253 | if flr not in filelinkrevs[f]: |
|
1233 | 1254 | self.ui.warn("%s:%s points to unexpected changeset %d\n" |
|
1234 | 1255 | % (f, short(n), fl.linkrev(n))) |
|
1235 | 1256 | errors += 1 |
|
1236 | 1257 | else: |
|
1237 | 1258 | filelinkrevs[f].remove(flr) |
|
1238 | 1259 | |
|
1239 | 1260 | # verify contents |
|
1240 | 1261 | try: |
|
1241 | 1262 | t = fl.read(n) |
|
1242 | 1263 | except Exception, inst: |
|
1243 | 1264 | self.ui.warn("unpacking file %s %s: %s\n" |
|
1244 | 1265 | % (f, short(n), inst)) |
|
1245 | 1266 | errors += 1 |
|
1246 | 1267 | |
|
1247 | 1268 | # verify parents |
|
1248 | 1269 | (p1, p2) = fl.parents(n) |
|
1249 | 1270 | if p1 not in nodes: |
|
1250 | 1271 | self.ui.warn("file %s:%s unknown parent 1 %s" % |
|
1251 | 1272 | (f, short(n), short(p1))) |
|
1252 | 1273 | errors += 1 |
|
1253 | 1274 | if p2 not in nodes: |
|
1254 | 1275 | self.ui.warn("file %s:%s unknown parent 2 %s" % |
|
1255 | 1276 | (f, short(n), short(p1))) |
|
1256 | 1277 | errors += 1 |
|
1257 | 1278 | nodes[n] = 1 |
|
1258 | 1279 | |
|
1259 | 1280 | # cross-check |
|
1260 | 1281 | for node in filenodes[f]: |
|
1261 | 1282 | self.ui.warn("node %s in manifests not in %s\n" |
|
1262 | 1283 | % (hex(n), f)) |
|
1263 | 1284 | errors += 1 |
|
1264 | 1285 | |
|
1265 | 1286 | self.ui.status("%d files, %d changesets, %d total revisions\n" % |
|
1266 | 1287 | (files, changesets, revisions)) |
|
1267 | 1288 | |
|
1268 | 1289 | if errors: |
|
1269 | 1290 | self.ui.warn("%d integrity errors encountered!\n" % errors) |
|
1270 | 1291 | return 1 |
|
1271 | 1292 | |
|
1272 | 1293 | class remoterepository: |
|
1273 | 1294 | def __init__(self, ui, path): |
|
1274 | 1295 | self.url = path |
|
1275 | 1296 | self.ui = ui |
|
1276 | 1297 | no_list = [ "localhost", "127.0.0.1" ] |
|
1277 | 1298 | host = ui.config("http_proxy", "host") |
|
1278 | 1299 | user = ui.config("http_proxy", "user") |
|
1279 | 1300 | passwd = ui.config("http_proxy", "passwd") |
|
1280 | 1301 | no = ui.config("http_proxy", "no") |
|
1281 | 1302 | if no: |
|
1282 | 1303 | no_list = no_list + no.split(",") |
|
1283 | 1304 | |
|
1284 | 1305 | no_proxy = 0 |
|
1285 | 1306 | for h in no_list: |
|
1286 | 1307 | if (path.startswith("http://" + h + "/") or |
|
1287 | 1308 | path.startswith("http://" + h + ":") or |
|
1288 | 1309 | path == "http://" + h): |
|
1289 | 1310 | no_proxy = 1 |
|
1290 | 1311 | |
|
1291 | 1312 | # Note: urllib2 takes proxy values from the environment and those will |
|
1292 | 1313 | # take precedence |
|
1293 | 1314 | |
|
1294 | 1315 | proxy_handler = urllib2.BaseHandler() |
|
1295 | 1316 | if host and not no_proxy: |
|
1296 | 1317 | proxy_handler = urllib2.ProxyHandler({"http" : "http://" + host}) |
|
1297 | 1318 | |
|
1298 | 1319 | authinfo = None |
|
1299 | 1320 | if user and passwd: |
|
1300 | 1321 | passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm() |
|
1301 | 1322 | passmgr.add_password(None, host, user, passwd) |
|
1302 | 1323 | authinfo = urllib2.ProxyBasicAuthHandler(passmgr) |
|
1303 | 1324 | |
|
1304 | 1325 | opener = urllib2.build_opener(proxy_handler, authinfo) |
|
1305 | 1326 | urllib2.install_opener(opener) |
|
1306 | 1327 | |
|
1307 | 1328 | def do_cmd(self, cmd, **args): |
|
1308 | 1329 | self.ui.debug("sending %s command\n" % cmd) |
|
1309 | 1330 | q = {"cmd": cmd} |
|
1310 | 1331 | q.update(args) |
|
1311 | 1332 | qs = urllib.urlencode(q) |
|
1312 | 1333 | cu = "%s?%s" % (self.url, qs) |
|
1313 | 1334 | return urllib2.urlopen(cu) |
|
1314 | 1335 | |
|
1315 | 1336 | def heads(self): |
|
1316 | 1337 | d = self.do_cmd("heads").read() |
|
1317 | 1338 | try: |
|
1318 | 1339 | return map(bin, d[:-1].split(" ")) |
|
1319 | 1340 | except: |
|
1320 | 1341 | self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") |
|
1321 | 1342 | raise |
|
1322 | 1343 | |
|
1323 | 1344 | def branches(self, nodes): |
|
1324 | 1345 | n = " ".join(map(hex, nodes)) |
|
1325 | 1346 | d = self.do_cmd("branches", nodes=n).read() |
|
1326 | 1347 | try: |
|
1327 | 1348 | br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] |
|
1328 | 1349 | return br |
|
1329 | 1350 | except: |
|
1330 | 1351 | self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") |
|
1331 | 1352 | raise |
|
1332 | 1353 | |
|
1333 | 1354 | def between(self, pairs): |
|
1334 | 1355 | n = "\n".join(["-".join(map(hex, p)) for p in pairs]) |
|
1335 | 1356 | d = self.do_cmd("between", pairs=n).read() |
|
1336 | 1357 | try: |
|
1337 | 1358 | p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] |
|
1338 | 1359 | return p |
|
1339 | 1360 | except: |
|
1340 | 1361 | self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") |
|
1341 | 1362 | raise |
|
1342 | 1363 | |
|
1343 | 1364 | def changegroup(self, nodes): |
|
1344 | 1365 | n = " ".join(map(hex, nodes)) |
|
1345 | 1366 | zd = zlib.decompressobj() |
|
1346 | 1367 | f = self.do_cmd("changegroup", roots=n) |
|
1347 | 1368 | bytes = 0 |
|
1348 | 1369 | while 1: |
|
1349 | 1370 | d = f.read(4096) |
|
1350 | 1371 | bytes += len(d) |
|
1351 | 1372 | if not d: |
|
1352 | 1373 | yield zd.flush() |
|
1353 | 1374 | break |
|
1354 | 1375 | yield zd.decompress(d) |
|
1355 | 1376 | self.ui.note("%d bytes of data transfered\n" % bytes) |
|
1356 | 1377 | |
|
1357 | 1378 | def repository(ui, path=None, create=0): |
|
1358 | 1379 | if path and path[:7] == "http://": |
|
1359 | 1380 | return remoterepository(ui, path) |
|
1360 | 1381 | if path and path[:5] == "hg://": |
|
1361 | 1382 | return remoterepository(ui, path.replace("hg://", "http://")) |
|
1362 | 1383 | if path and path[:11] == "old-http://": |
|
1363 | 1384 | return localrepository(ui, path.replace("old-http://", "http://")) |
|
1364 | 1385 | else: |
|
1365 | 1386 | return localrepository(ui, path, create) |
|
1366 | 1387 | |
|
1367 | 1388 | class httprangereader: |
|
1368 | 1389 | def __init__(self, url): |
|
1369 | 1390 | self.url = url |
|
1370 | 1391 | self.pos = 0 |
|
1371 | 1392 | def seek(self, pos): |
|
1372 | 1393 | self.pos = pos |
|
1373 | 1394 | def read(self, bytes=None): |
|
1374 | 1395 | opener = urllib2.build_opener(byterange.HTTPRangeHandler()) |
|
1375 | 1396 | urllib2.install_opener(opener) |
|
1376 | 1397 | req = urllib2.Request(self.url) |
|
1377 | 1398 | end = '' |
|
1378 | 1399 | if bytes: end = self.pos + bytes |
|
1379 | 1400 | req.add_header('Range', 'bytes=%d-%s' % (self.pos, end)) |
|
1380 | 1401 | f = urllib2.urlopen(req) |
|
1381 | 1402 | return f.read() |
General Comments 0
You need to be logged in to leave comments.
Login now