##// END OF EJS Templates
changegroup: document that 'source' parameter exists for extensions...
Martin von Zweigbergk -
r24897:5c35a604 default
parent child Browse files
Show More
@@ -1,899 +1,900 b''
1 1 # changegroup.py - Mercurial changegroup manipulation functions
2 2 #
3 3 # Copyright 2006 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 import weakref
9 9 from i18n import _
10 10 from node import nullrev, nullid, hex, short
11 11 import mdiff, util, dagutil
12 12 import struct, os, bz2, zlib, tempfile
13 13 import discovery, error, phases, branchmap
14 14
15 15 _CHANGEGROUPV1_DELTA_HEADER = "20s20s20s20s"
16 16 _CHANGEGROUPV2_DELTA_HEADER = "20s20s20s20s20s"
17 17
18 18 def readexactly(stream, n):
19 19 '''read n bytes from stream.read and abort if less was available'''
20 20 s = stream.read(n)
21 21 if len(s) < n:
22 22 raise util.Abort(_("stream ended unexpectedly"
23 23 " (got %d bytes, expected %d)")
24 24 % (len(s), n))
25 25 return s
26 26
27 27 def getchunk(stream):
28 28 """return the next chunk from stream as a string"""
29 29 d = readexactly(stream, 4)
30 30 l = struct.unpack(">l", d)[0]
31 31 if l <= 4:
32 32 if l:
33 33 raise util.Abort(_("invalid chunk length %d") % l)
34 34 return ""
35 35 return readexactly(stream, l - 4)
36 36
37 37 def chunkheader(length):
38 38 """return a changegroup chunk header (string)"""
39 39 return struct.pack(">l", length + 4)
40 40
41 41 def closechunk():
42 42 """return a changegroup chunk header (string) for a zero-length chunk"""
43 43 return struct.pack(">l", 0)
44 44
45 45 def combineresults(results):
46 46 """logic to combine 0 or more addchangegroup results into one"""
47 47 changedheads = 0
48 48 result = 1
49 49 for ret in results:
50 50 # If any changegroup result is 0, return 0
51 51 if ret == 0:
52 52 result = 0
53 53 break
54 54 if ret < -1:
55 55 changedheads += ret + 1
56 56 elif ret > 1:
57 57 changedheads += ret - 1
58 58 if changedheads > 0:
59 59 result = 1 + changedheads
60 60 elif changedheads < 0:
61 61 result = -1 + changedheads
62 62 return result
63 63
64 64 class nocompress(object):
65 65 def compress(self, x):
66 66 return x
67 67 def flush(self):
68 68 return ""
69 69
70 70 bundletypes = {
71 71 "": ("", nocompress), # only when using unbundle on ssh and old http servers
72 72 # since the unification ssh accepts a header but there
73 73 # is no capability signaling it.
74 74 "HG20": (), # special-cased below
75 75 "HG10UN": ("HG10UN", nocompress),
76 76 "HG10BZ": ("HG10", lambda: bz2.BZ2Compressor()),
77 77 "HG10GZ": ("HG10GZ", lambda: zlib.compressobj()),
78 78 }
79 79
80 80 # hgweb uses this list to communicate its preferred type
81 81 bundlepriority = ['HG10GZ', 'HG10BZ', 'HG10UN']
82 82
83 83 def writebundle(ui, cg, filename, bundletype, vfs=None):
84 84 """Write a bundle file and return its filename.
85 85
86 86 Existing files will not be overwritten.
87 87 If no filename is specified, a temporary file is created.
88 88 bz2 compression can be turned off.
89 89 The bundle file will be deleted in case of errors.
90 90 """
91 91
92 92 fh = None
93 93 cleanup = None
94 94 try:
95 95 if filename:
96 96 if vfs:
97 97 fh = vfs.open(filename, "wb")
98 98 else:
99 99 fh = open(filename, "wb")
100 100 else:
101 101 fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg")
102 102 fh = os.fdopen(fd, "wb")
103 103 cleanup = filename
104 104
105 105 if bundletype == "HG20":
106 106 import bundle2
107 107 bundle = bundle2.bundle20(ui)
108 108 part = bundle.newpart('changegroup', data=cg.getchunks())
109 109 part.addparam('version', cg.version)
110 110 z = nocompress()
111 111 chunkiter = bundle.getchunks()
112 112 else:
113 113 if cg.version != '01':
114 114 raise util.Abort(_('old bundle types only supports v1 '
115 115 'changegroups'))
116 116 header, compressor = bundletypes[bundletype]
117 117 fh.write(header)
118 118 z = compressor()
119 119 chunkiter = cg.getchunks()
120 120
121 121 # parse the changegroup data, otherwise we will block
122 122 # in case of sshrepo because we don't know the end of the stream
123 123
124 124 # an empty chunkgroup is the end of the changegroup
125 125 # a changegroup has at least 2 chunkgroups (changelog and manifest).
126 126 # after that, an empty chunkgroup is the end of the changegroup
127 127 for chunk in chunkiter:
128 128 fh.write(z.compress(chunk))
129 129 fh.write(z.flush())
130 130 cleanup = None
131 131 return filename
132 132 finally:
133 133 if fh is not None:
134 134 fh.close()
135 135 if cleanup is not None:
136 136 if filename and vfs:
137 137 vfs.unlink(cleanup)
138 138 else:
139 139 os.unlink(cleanup)
140 140
141 141 def decompressor(fh, alg):
142 142 if alg == 'UN':
143 143 return fh
144 144 elif alg == 'GZ':
145 145 def generator(f):
146 146 zd = zlib.decompressobj()
147 147 for chunk in util.filechunkiter(f):
148 148 yield zd.decompress(chunk)
149 149 elif alg == 'BZ':
150 150 def generator(f):
151 151 zd = bz2.BZ2Decompressor()
152 152 zd.decompress("BZ")
153 153 for chunk in util.filechunkiter(f, 4096):
154 154 yield zd.decompress(chunk)
155 155 else:
156 156 raise util.Abort("unknown bundle compression '%s'" % alg)
157 157 return util.chunkbuffer(generator(fh))
158 158
159 159 class cg1unpacker(object):
160 160 deltaheader = _CHANGEGROUPV1_DELTA_HEADER
161 161 deltaheadersize = struct.calcsize(deltaheader)
162 162 version = '01'
163 163 def __init__(self, fh, alg):
164 164 self._stream = decompressor(fh, alg)
165 165 self._type = alg
166 166 self.callback = None
167 167 def compressed(self):
168 168 return self._type != 'UN'
169 169 def read(self, l):
170 170 return self._stream.read(l)
171 171 def seek(self, pos):
172 172 return self._stream.seek(pos)
173 173 def tell(self):
174 174 return self._stream.tell()
175 175 def close(self):
176 176 return self._stream.close()
177 177
178 178 def chunklength(self):
179 179 d = readexactly(self._stream, 4)
180 180 l = struct.unpack(">l", d)[0]
181 181 if l <= 4:
182 182 if l:
183 183 raise util.Abort(_("invalid chunk length %d") % l)
184 184 return 0
185 185 if self.callback:
186 186 self.callback()
187 187 return l - 4
188 188
189 189 def changelogheader(self):
190 190 """v10 does not have a changelog header chunk"""
191 191 return {}
192 192
193 193 def manifestheader(self):
194 194 """v10 does not have a manifest header chunk"""
195 195 return {}
196 196
197 197 def filelogheader(self):
198 198 """return the header of the filelogs chunk, v10 only has the filename"""
199 199 l = self.chunklength()
200 200 if not l:
201 201 return {}
202 202 fname = readexactly(self._stream, l)
203 203 return {'filename': fname}
204 204
205 205 def _deltaheader(self, headertuple, prevnode):
206 206 node, p1, p2, cs = headertuple
207 207 if prevnode is None:
208 208 deltabase = p1
209 209 else:
210 210 deltabase = prevnode
211 211 return node, p1, p2, deltabase, cs
212 212
213 213 def deltachunk(self, prevnode):
214 214 l = self.chunklength()
215 215 if not l:
216 216 return {}
217 217 headerdata = readexactly(self._stream, self.deltaheadersize)
218 218 header = struct.unpack(self.deltaheader, headerdata)
219 219 delta = readexactly(self._stream, l - self.deltaheadersize)
220 220 node, p1, p2, deltabase, cs = self._deltaheader(header, prevnode)
221 221 return {'node': node, 'p1': p1, 'p2': p2, 'cs': cs,
222 222 'deltabase': deltabase, 'delta': delta}
223 223
224 224 def getchunks(self):
225 225 """returns all the chunks contains in the bundle
226 226
227 227 Used when you need to forward the binary stream to a file or another
228 228 network API. To do so, it parse the changegroup data, otherwise it will
229 229 block in case of sshrepo because it don't know the end of the stream.
230 230 """
231 231 # an empty chunkgroup is the end of the changegroup
232 232 # a changegroup has at least 2 chunkgroups (changelog and manifest).
233 233 # after that, an empty chunkgroup is the end of the changegroup
234 234 empty = False
235 235 count = 0
236 236 while not empty or count <= 2:
237 237 empty = True
238 238 count += 1
239 239 while True:
240 240 chunk = getchunk(self)
241 241 if not chunk:
242 242 break
243 243 empty = False
244 244 yield chunkheader(len(chunk))
245 245 pos = 0
246 246 while pos < len(chunk):
247 247 next = pos + 2**20
248 248 yield chunk[pos:next]
249 249 pos = next
250 250 yield closechunk()
251 251
252 252 class cg2unpacker(cg1unpacker):
253 253 deltaheader = _CHANGEGROUPV2_DELTA_HEADER
254 254 deltaheadersize = struct.calcsize(deltaheader)
255 255 version = '02'
256 256
257 257 def _deltaheader(self, headertuple, prevnode):
258 258 node, p1, p2, deltabase, cs = headertuple
259 259 return node, p1, p2, deltabase, cs
260 260
261 261 class headerlessfixup(object):
262 262 def __init__(self, fh, h):
263 263 self._h = h
264 264 self._fh = fh
265 265 def read(self, n):
266 266 if self._h:
267 267 d, self._h = self._h[:n], self._h[n:]
268 268 if len(d) < n:
269 269 d += readexactly(self._fh, n - len(d))
270 270 return d
271 271 return readexactly(self._fh, n)
272 272
273 273 class cg1packer(object):
274 274 deltaheader = _CHANGEGROUPV1_DELTA_HEADER
275 275 version = '01'
276 276 def __init__(self, repo, bundlecaps=None):
277 277 """Given a source repo, construct a bundler.
278 278
279 279 bundlecaps is optional and can be used to specify the set of
280 280 capabilities which can be used to build the bundle.
281 281 """
282 282 # Set of capabilities we can use to build the bundle.
283 283 if bundlecaps is None:
284 284 bundlecaps = set()
285 285 self._bundlecaps = bundlecaps
286 286 self._changelog = repo.changelog
287 287 self._manifest = repo.manifest
288 288 reorder = repo.ui.config('bundle', 'reorder', 'auto')
289 289 if reorder == 'auto':
290 290 reorder = None
291 291 else:
292 292 reorder = util.parsebool(reorder)
293 293 self._repo = repo
294 294 self._reorder = reorder
295 295 self._progress = repo.ui.progress
296 296 if self._repo.ui.verbose and not self._repo.ui.debugflag:
297 297 self._verbosenote = self._repo.ui.note
298 298 else:
299 299 self._verbosenote = lambda s: None
300 300
301 301 def close(self):
302 302 return closechunk()
303 303
304 304 def fileheader(self, fname):
305 305 return chunkheader(len(fname)) + fname
306 306
307 307 def group(self, nodelist, revlog, lookup, units=None, reorder=None):
308 308 """Calculate a delta group, yielding a sequence of changegroup chunks
309 309 (strings).
310 310
311 311 Given a list of changeset revs, return a set of deltas and
312 312 metadata corresponding to nodes. The first delta is
313 313 first parent(nodelist[0]) -> nodelist[0], the receiver is
314 314 guaranteed to have this parent as it has all history before
315 315 these changesets. In the case firstparent is nullrev the
316 316 changegroup starts with a full revision.
317 317
318 318 If units is not None, progress detail will be generated, units specifies
319 319 the type of revlog that is touched (changelog, manifest, etc.).
320 320 """
321 321 # if we don't have any revisions touched by these changesets, bail
322 322 if len(nodelist) == 0:
323 323 yield self.close()
324 324 return
325 325
326 326 # for generaldelta revlogs, we linearize the revs; this will both be
327 327 # much quicker and generate a much smaller bundle
328 328 if (revlog._generaldelta and reorder is not False) or reorder:
329 329 dag = dagutil.revlogdag(revlog)
330 330 revs = set(revlog.rev(n) for n in nodelist)
331 331 revs = dag.linearize(revs)
332 332 else:
333 333 revs = sorted([revlog.rev(n) for n in nodelist])
334 334
335 335 # add the parent of the first rev
336 336 p = revlog.parentrevs(revs[0])[0]
337 337 revs.insert(0, p)
338 338
339 339 # build deltas
340 340 total = len(revs) - 1
341 341 msgbundling = _('bundling')
342 342 for r in xrange(len(revs) - 1):
343 343 if units is not None:
344 344 self._progress(msgbundling, r + 1, unit=units, total=total)
345 345 prev, curr = revs[r], revs[r + 1]
346 346 linknode = lookup(revlog.node(curr))
347 347 for c in self.revchunk(revlog, curr, prev, linknode):
348 348 yield c
349 349
350 350 yield self.close()
351 351
352 352 # filter any nodes that claim to be part of the known set
353 353 def prune(self, revlog, missing, commonrevs):
354 354 rr, rl = revlog.rev, revlog.linkrev
355 355 return [n for n in missing if rl(rr(n)) not in commonrevs]
356 356
357 357 def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
358 358 '''yield a sequence of changegroup chunks (strings)'''
359 359 repo = self._repo
360 360 cl = self._changelog
361 361 mf = self._manifest
362 362 reorder = self._reorder
363 363 progress = self._progress
364 364
365 365 # for progress output
366 366 msgbundling = _('bundling')
367 367
368 368 clrevorder = {}
369 369 mfs = {} # needed manifests
370 370 fnodes = {} # needed file nodes
371 371 changedfiles = set()
372 372
373 373 # Callback for the changelog, used to collect changed files and manifest
374 374 # nodes.
375 375 # Returns the linkrev node (identity in the changelog case).
376 376 def lookupcl(x):
377 377 c = cl.read(x)
378 378 clrevorder[x] = len(clrevorder)
379 379 changedfiles.update(c[3])
380 380 # record the first changeset introducing this manifest version
381 381 mfs.setdefault(c[0], x)
382 382 return x
383 383
384 384 self._verbosenote(_('uncompressed size of bundle content:\n'))
385 385 size = 0
386 386 for chunk in self.group(clnodes, cl, lookupcl, units=_('changesets'),
387 387 reorder=reorder):
388 388 size += len(chunk)
389 389 yield chunk
390 390 self._verbosenote(_('%8.i (changelog)\n') % size)
391 391 progress(msgbundling, None)
392 392
393 393 # Callback for the manifest, used to collect linkrevs for filelog
394 394 # revisions.
395 395 # Returns the linkrev node (collected in lookupcl).
396 396 def lookupmf(x):
397 397 clnode = mfs[x]
398 398 if not fastpathlinkrev or reorder:
399 399 mdata = mf.readfast(x)
400 400 for f, n in mdata.iteritems():
401 401 if f in changedfiles:
402 402 # record the first changeset introducing this filelog
403 403 # version
404 404 fclnodes = fnodes.setdefault(f, {})
405 405 fclnode = fclnodes.setdefault(n, clnode)
406 406 if clrevorder[clnode] < clrevorder[fclnode]:
407 407 fclnodes[n] = clnode
408 408 return clnode
409 409
410 410 mfnodes = self.prune(mf, mfs, commonrevs)
411 411 size = 0
412 412 for chunk in self.group(mfnodes, mf, lookupmf, units=_('manifests'),
413 413 reorder=reorder):
414 414 size += len(chunk)
415 415 yield chunk
416 416 self._verbosenote(_('%8.i (manifests)\n') % size)
417 417 progress(msgbundling, None)
418 418
419 419 mfs.clear()
420 420 needed = set(cl.rev(x) for x in clnodes)
421 421
422 422 def linknodes(filerevlog, fname):
423 423 if fastpathlinkrev and not reorder:
424 424 llr = filerevlog.linkrev
425 425 def genfilenodes():
426 426 for r in filerevlog:
427 427 linkrev = llr(r)
428 428 if linkrev in needed:
429 429 yield filerevlog.node(r), cl.node(linkrev)
430 430 return dict(genfilenodes())
431 431 return fnodes.get(fname, {})
432 432
433 433 for chunk in self.generatefiles(changedfiles, linknodes, commonrevs,
434 434 source):
435 435 yield chunk
436 436
437 437 yield self.close()
438 438 progress(msgbundling, None)
439 439
440 440 if clnodes:
441 441 repo.hook('outgoing', node=hex(clnodes[0]), source=source)
442 442
443 # The 'source' parameter is useful for extensions
443 444 def generatefiles(self, changedfiles, linknodes, commonrevs, source):
444 445 repo = self._repo
445 446 progress = self._progress
446 447 reorder = self._reorder
447 448 msgbundling = _('bundling')
448 449
449 450 total = len(changedfiles)
450 451 # for progress output
451 452 msgfiles = _('files')
452 453 for i, fname in enumerate(sorted(changedfiles)):
453 454 filerevlog = repo.file(fname)
454 455 if not filerevlog:
455 456 raise util.Abort(_("empty or missing revlog for %s") % fname)
456 457
457 458 linkrevnodes = linknodes(filerevlog, fname)
458 459 # Lookup for filenodes, we collected the linkrev nodes above in the
459 460 # fastpath case and with lookupmf in the slowpath case.
460 461 def lookupfilelog(x):
461 462 return linkrevnodes[x]
462 463
463 464 filenodes = self.prune(filerevlog, linkrevnodes, commonrevs)
464 465 if filenodes:
465 466 progress(msgbundling, i + 1, item=fname, unit=msgfiles,
466 467 total=total)
467 468 h = self.fileheader(fname)
468 469 size = len(h)
469 470 yield h
470 471 for chunk in self.group(filenodes, filerevlog, lookupfilelog,
471 472 reorder=reorder):
472 473 size += len(chunk)
473 474 yield chunk
474 475 self._verbosenote(_('%8.i %s\n') % (size, fname))
475 476
476 477 def deltaparent(self, revlog, rev, p1, p2, prev):
477 478 return prev
478 479
479 480 def revchunk(self, revlog, rev, prev, linknode):
480 481 node = revlog.node(rev)
481 482 p1, p2 = revlog.parentrevs(rev)
482 483 base = self.deltaparent(revlog, rev, p1, p2, prev)
483 484
484 485 prefix = ''
485 486 if revlog.iscensored(base) or revlog.iscensored(rev):
486 487 try:
487 488 delta = revlog.revision(node)
488 489 except error.CensoredNodeError, e:
489 490 delta = e.tombstone
490 491 if base == nullrev:
491 492 prefix = mdiff.trivialdiffheader(len(delta))
492 493 else:
493 494 baselen = revlog.rawsize(base)
494 495 prefix = mdiff.replacediffheader(baselen, len(delta))
495 496 elif base == nullrev:
496 497 delta = revlog.revision(node)
497 498 prefix = mdiff.trivialdiffheader(len(delta))
498 499 else:
499 500 delta = revlog.revdiff(base, rev)
500 501 p1n, p2n = revlog.parents(node)
501 502 basenode = revlog.node(base)
502 503 meta = self.builddeltaheader(node, p1n, p2n, basenode, linknode)
503 504 meta += prefix
504 505 l = len(meta) + len(delta)
505 506 yield chunkheader(l)
506 507 yield meta
507 508 yield delta
508 509 def builddeltaheader(self, node, p1n, p2n, basenode, linknode):
509 510 # do nothing with basenode, it is implicitly the previous one in HG10
510 511 return struct.pack(self.deltaheader, node, p1n, p2n, linknode)
511 512
512 513 class cg2packer(cg1packer):
513 514 version = '02'
514 515 deltaheader = _CHANGEGROUPV2_DELTA_HEADER
515 516
516 517 def group(self, nodelist, revlog, lookup, units=None, reorder=None):
517 518 if (revlog._generaldelta and reorder is not True):
518 519 reorder = False
519 520 return super(cg2packer, self).group(nodelist, revlog, lookup,
520 521 units=units, reorder=reorder)
521 522
522 523 def deltaparent(self, revlog, rev, p1, p2, prev):
523 524 dp = revlog.deltaparent(rev)
524 525 # avoid storing full revisions; pick prev in those cases
525 526 # also pick prev when we can't be sure remote has dp
526 527 if dp == nullrev or (dp != p1 and dp != p2 and dp != prev):
527 528 return prev
528 529 return dp
529 530
530 531 def builddeltaheader(self, node, p1n, p2n, basenode, linknode):
531 532 return struct.pack(self.deltaheader, node, p1n, p2n, basenode, linknode)
532 533
533 534 packermap = {'01': (cg1packer, cg1unpacker),
534 535 '02': (cg2packer, cg2unpacker)}
535 536
536 537 def _changegroupinfo(repo, nodes, source):
537 538 if repo.ui.verbose or source == 'bundle':
538 539 repo.ui.status(_("%d changesets found\n") % len(nodes))
539 540 if repo.ui.debugflag:
540 541 repo.ui.debug("list of changesets:\n")
541 542 for node in nodes:
542 543 repo.ui.debug("%s\n" % hex(node))
543 544
544 545 def getsubsetraw(repo, outgoing, bundler, source, fastpath=False):
545 546 repo = repo.unfiltered()
546 547 commonrevs = outgoing.common
547 548 csets = outgoing.missing
548 549 heads = outgoing.missingheads
549 550 # We go through the fast path if we get told to, or if all (unfiltered
550 551 # heads have been requested (since we then know there all linkrevs will
551 552 # be pulled by the client).
552 553 heads.sort()
553 554 fastpathlinkrev = fastpath or (
554 555 repo.filtername is None and heads == sorted(repo.heads()))
555 556
556 557 repo.hook('preoutgoing', throw=True, source=source)
557 558 _changegroupinfo(repo, csets, source)
558 559 return bundler.generate(commonrevs, csets, fastpathlinkrev, source)
559 560
560 561 def getsubset(repo, outgoing, bundler, source, fastpath=False, version='01'):
561 562 gengroup = getsubsetraw(repo, outgoing, bundler, source, fastpath)
562 563 return packermap[version][1](util.chunkbuffer(gengroup), 'UN')
563 564
564 565 def changegroupsubset(repo, roots, heads, source, version='01'):
565 566 """Compute a changegroup consisting of all the nodes that are
566 567 descendants of any of the roots and ancestors of any of the heads.
567 568 Return a chunkbuffer object whose read() method will return
568 569 successive changegroup chunks.
569 570
570 571 It is fairly complex as determining which filenodes and which
571 572 manifest nodes need to be included for the changeset to be complete
572 573 is non-trivial.
573 574
574 575 Another wrinkle is doing the reverse, figuring out which changeset in
575 576 the changegroup a particular filenode or manifestnode belongs to.
576 577 """
577 578 cl = repo.changelog
578 579 if not roots:
579 580 roots = [nullid]
580 581 # TODO: remove call to nodesbetween.
581 582 csets, roots, heads = cl.nodesbetween(roots, heads)
582 583 discbases = []
583 584 for n in roots:
584 585 discbases.extend([p for p in cl.parents(n) if p != nullid])
585 586 outgoing = discovery.outgoing(cl, discbases, heads)
586 587 bundler = packermap[version][0](repo)
587 588 return getsubset(repo, outgoing, bundler, source, version=version)
588 589
589 590 def getlocalchangegroupraw(repo, source, outgoing, bundlecaps=None,
590 591 version='01'):
591 592 """Like getbundle, but taking a discovery.outgoing as an argument.
592 593
593 594 This is only implemented for local repos and reuses potentially
594 595 precomputed sets in outgoing. Returns a raw changegroup generator."""
595 596 if not outgoing.missing:
596 597 return None
597 598 bundler = packermap[version][0](repo, bundlecaps)
598 599 return getsubsetraw(repo, outgoing, bundler, source)
599 600
600 601 def getlocalchangegroup(repo, source, outgoing, bundlecaps=None):
601 602 """Like getbundle, but taking a discovery.outgoing as an argument.
602 603
603 604 This is only implemented for local repos and reuses potentially
604 605 precomputed sets in outgoing."""
605 606 if not outgoing.missing:
606 607 return None
607 608 bundler = cg1packer(repo, bundlecaps)
608 609 return getsubset(repo, outgoing, bundler, source)
609 610
610 611 def _computeoutgoing(repo, heads, common):
611 612 """Computes which revs are outgoing given a set of common
612 613 and a set of heads.
613 614
614 615 This is a separate function so extensions can have access to
615 616 the logic.
616 617
617 618 Returns a discovery.outgoing object.
618 619 """
619 620 cl = repo.changelog
620 621 if common:
621 622 hasnode = cl.hasnode
622 623 common = [n for n in common if hasnode(n)]
623 624 else:
624 625 common = [nullid]
625 626 if not heads:
626 627 heads = cl.heads()
627 628 return discovery.outgoing(cl, common, heads)
628 629
629 630 def getchangegroupraw(repo, source, heads=None, common=None, bundlecaps=None,
630 631 version='01'):
631 632 """Like changegroupsubset, but returns the set difference between the
632 633 ancestors of heads and the ancestors common.
633 634
634 635 If heads is None, use the local heads. If common is None, use [nullid].
635 636
636 637 If version is None, use a version '1' changegroup.
637 638
638 639 The nodes in common might not all be known locally due to the way the
639 640 current discovery protocol works. Returns a raw changegroup generator.
640 641 """
641 642 outgoing = _computeoutgoing(repo, heads, common)
642 643 return getlocalchangegroupraw(repo, source, outgoing, bundlecaps=bundlecaps,
643 644 version=version)
644 645
645 646 def getchangegroup(repo, source, heads=None, common=None, bundlecaps=None):
646 647 """Like changegroupsubset, but returns the set difference between the
647 648 ancestors of heads and the ancestors common.
648 649
649 650 If heads is None, use the local heads. If common is None, use [nullid].
650 651
651 652 The nodes in common might not all be known locally due to the way the
652 653 current discovery protocol works.
653 654 """
654 655 outgoing = _computeoutgoing(repo, heads, common)
655 656 return getlocalchangegroup(repo, source, outgoing, bundlecaps=bundlecaps)
656 657
657 658 def changegroup(repo, basenodes, source):
658 659 # to avoid a race we use changegroupsubset() (issue1320)
659 660 return changegroupsubset(repo, basenodes, repo.heads(), source)
660 661
661 662 def addchangegroupfiles(repo, source, revmap, trp, pr, needfiles):
662 663 revisions = 0
663 664 files = 0
664 665 while True:
665 666 chunkdata = source.filelogheader()
666 667 if not chunkdata:
667 668 break
668 669 f = chunkdata["filename"]
669 670 repo.ui.debug("adding %s revisions\n" % f)
670 671 pr()
671 672 fl = repo.file(f)
672 673 o = len(fl)
673 674 try:
674 675 if not fl.addgroup(source, revmap, trp):
675 676 raise util.Abort(_("received file revlog group is empty"))
676 677 except error.CensoredBaseError, e:
677 678 raise util.Abort(_("received delta base is censored: %s") % e)
678 679 revisions += len(fl) - o
679 680 files += 1
680 681 if f in needfiles:
681 682 needs = needfiles[f]
682 683 for new in xrange(o, len(fl)):
683 684 n = fl.node(new)
684 685 if n in needs:
685 686 needs.remove(n)
686 687 else:
687 688 raise util.Abort(
688 689 _("received spurious file revlog entry"))
689 690 if not needs:
690 691 del needfiles[f]
691 692 repo.ui.progress(_('files'), None)
692 693
693 694 for f, needs in needfiles.iteritems():
694 695 fl = repo.file(f)
695 696 for n in needs:
696 697 try:
697 698 fl.rev(n)
698 699 except error.LookupError:
699 700 raise util.Abort(
700 701 _('missing file data for %s:%s - run hg verify') %
701 702 (f, hex(n)))
702 703
703 704 return revisions, files
704 705
705 706 def addchangegroup(repo, source, srctype, url, emptyok=False,
706 707 targetphase=phases.draft):
707 708 """Add the changegroup returned by source.read() to this repo.
708 709 srctype is a string like 'push', 'pull', or 'unbundle'. url is
709 710 the URL of the repo where this changegroup is coming from.
710 711
711 712 Return an integer summarizing the change to this repo:
712 713 - nothing changed or no source: 0
713 714 - more heads than before: 1+added heads (2..n)
714 715 - fewer heads than before: -1-removed heads (-2..-n)
715 716 - number of heads stays the same: 1
716 717 """
717 718 repo = repo.unfiltered()
718 719 def csmap(x):
719 720 repo.ui.debug("add changeset %s\n" % short(x))
720 721 return len(cl)
721 722
722 723 def revmap(x):
723 724 return cl.rev(x)
724 725
725 726 if not source:
726 727 return 0
727 728
728 729 changesets = files = revisions = 0
729 730 efiles = set()
730 731
731 732 tr = repo.transaction("\n".join([srctype, util.hidepassword(url)]))
732 733 # The transaction could have been created before and already carries source
733 734 # information. In this case we use the top level data. We overwrite the
734 735 # argument because we need to use the top level value (if they exist) in
735 736 # this function.
736 737 srctype = tr.hookargs.setdefault('source', srctype)
737 738 url = tr.hookargs.setdefault('url', url)
738 739
739 740 # write changelog data to temp files so concurrent readers will not see
740 741 # inconsistent view
741 742 cl = repo.changelog
742 743 cl.delayupdate(tr)
743 744 oldheads = cl.heads()
744 745 try:
745 746 repo.hook('prechangegroup', throw=True, **tr.hookargs)
746 747
747 748 trp = weakref.proxy(tr)
748 749 # pull off the changeset group
749 750 repo.ui.status(_("adding changesets\n"))
750 751 clstart = len(cl)
751 752 class prog(object):
752 753 step = _('changesets')
753 754 count = 1
754 755 ui = repo.ui
755 756 total = None
756 757 def __call__(repo):
757 758 repo.ui.progress(repo.step, repo.count, unit=_('chunks'),
758 759 total=repo.total)
759 760 repo.count += 1
760 761 pr = prog()
761 762 source.callback = pr
762 763
763 764 source.changelogheader()
764 765 srccontent = cl.addgroup(source, csmap, trp)
765 766 if not (srccontent or emptyok):
766 767 raise util.Abort(_("received changelog group is empty"))
767 768 clend = len(cl)
768 769 changesets = clend - clstart
769 770 for c in xrange(clstart, clend):
770 771 efiles.update(repo[c].files())
771 772 efiles = len(efiles)
772 773 repo.ui.progress(_('changesets'), None)
773 774
774 775 # pull off the manifest group
775 776 repo.ui.status(_("adding manifests\n"))
776 777 pr.step = _('manifests')
777 778 pr.count = 1
778 779 pr.total = changesets # manifests <= changesets
779 780 # no need to check for empty manifest group here:
780 781 # if the result of the merge of 1 and 2 is the same in 3 and 4,
781 782 # no new manifest will be created and the manifest group will
782 783 # be empty during the pull
783 784 source.manifestheader()
784 785 repo.manifest.addgroup(source, revmap, trp)
785 786 repo.ui.progress(_('manifests'), None)
786 787
787 788 needfiles = {}
788 789 if repo.ui.configbool('server', 'validate', default=False):
789 790 # validate incoming csets have their manifests
790 791 for cset in xrange(clstart, clend):
791 792 mfest = repo.changelog.read(repo.changelog.node(cset))[0]
792 793 mfest = repo.manifest.readdelta(mfest)
793 794 # store file nodes we must see
794 795 for f, n in mfest.iteritems():
795 796 needfiles.setdefault(f, set()).add(n)
796 797
797 798 # process the files
798 799 repo.ui.status(_("adding file changes\n"))
799 800 pr.step = _('files')
800 801 pr.count = 1
801 802 pr.total = efiles
802 803 source.callback = None
803 804
804 805 newrevs, newfiles = addchangegroupfiles(repo, source, revmap, trp, pr,
805 806 needfiles)
806 807 revisions += newrevs
807 808 files += newfiles
808 809
809 810 dh = 0
810 811 if oldheads:
811 812 heads = cl.heads()
812 813 dh = len(heads) - len(oldheads)
813 814 for h in heads:
814 815 if h not in oldheads and repo[h].closesbranch():
815 816 dh -= 1
816 817 htext = ""
817 818 if dh:
818 819 htext = _(" (%+d heads)") % dh
819 820
820 821 repo.ui.status(_("added %d changesets"
821 822 " with %d changes to %d files%s\n")
822 823 % (changesets, revisions, files, htext))
823 824 repo.invalidatevolatilesets()
824 825
825 826 if changesets > 0:
826 827 p = lambda: tr.writepending() and repo.root or ""
827 828 if 'node' not in tr.hookargs:
828 829 tr.hookargs['node'] = hex(cl.node(clstart))
829 830 hookargs = dict(tr.hookargs)
830 831 else:
831 832 hookargs = dict(tr.hookargs)
832 833 hookargs['node'] = hex(cl.node(clstart))
833 834 repo.hook('pretxnchangegroup', throw=True, pending=p, **hookargs)
834 835
835 836 added = [cl.node(r) for r in xrange(clstart, clend)]
836 837 publishing = repo.ui.configbool('phases', 'publish', True)
837 838 if srctype in ('push', 'serve'):
838 839 # Old servers can not push the boundary themselves.
839 840 # New servers won't push the boundary if changeset already
840 841 # exists locally as secret
841 842 #
842 843 # We should not use added here but the list of all change in
843 844 # the bundle
844 845 if publishing:
845 846 phases.advanceboundary(repo, tr, phases.public, srccontent)
846 847 else:
847 848 # Those changesets have been pushed from the outside, their
848 849 # phases are going to be pushed alongside. Therefor
849 850 # `targetphase` is ignored.
850 851 phases.advanceboundary(repo, tr, phases.draft, srccontent)
851 852 phases.retractboundary(repo, tr, phases.draft, added)
852 853 elif srctype != 'strip':
853 854 # publishing only alter behavior during push
854 855 #
855 856 # strip should not touch boundary at all
856 857 phases.retractboundary(repo, tr, targetphase, added)
857 858
858 859 if changesets > 0:
859 860 if srctype != 'strip':
860 861 # During strip, branchcache is invalid but coming call to
861 862 # `destroyed` will repair it.
862 863 # In other case we can safely update cache on disk.
863 864 branchmap.updatecache(repo.filtered('served'))
864 865
865 866 def runhooks():
866 867 # These hooks run when the lock releases, not when the
867 868 # transaction closes. So it's possible for the changelog
868 869 # to have changed since we last saw it.
869 870 if clstart >= len(repo):
870 871 return
871 872
872 873 # forcefully update the on-disk branch cache
873 874 repo.ui.debug("updating the branch cache\n")
874 875 repo.hook("changegroup", **hookargs)
875 876
876 877 for n in added:
877 878 args = hookargs.copy()
878 879 args['node'] = hex(n)
879 880 repo.hook("incoming", **args)
880 881
881 882 newheads = [h for h in repo.heads() if h not in oldheads]
882 883 repo.ui.log("incoming",
883 884 "%s incoming changes - new heads: %s\n",
884 885 len(added),
885 886 ', '.join([hex(c[:6]) for c in newheads]))
886 887
887 888 tr.addpostclose('changegroup-runhooks-%020i' % clstart,
888 889 lambda tr: repo._afterlock(runhooks))
889 890
890 891 tr.close()
891 892
892 893 finally:
893 894 tr.release()
894 895 repo.ui.flush()
895 896 # never return 0 here:
896 897 if dh < 0:
897 898 return dh - 1
898 899 else:
899 900 return dh + 1
General Comments 0
You need to be logged in to leave comments. Login now