##// END OF EJS Templates
changegroup: extract condition for linkrev fastpath...
Martin von Zweigbergk -
r24976:147d8892 default
parent child Browse files
Show More
@@ -361,7 +361,6 b' class cg1packer(object):'
361 repo = self._repo
361 repo = self._repo
362 cl = self._changelog
362 cl = self._changelog
363 ml = self._manifest
363 ml = self._manifest
364 reorder = self._reorder
365
364
366 clrevorder = {}
365 clrevorder = {}
367 mfs = {} # needed manifests
366 mfs = {} # needed manifests
@@ -386,12 +385,13 b' class cg1packer(object):'
386 yield chunk
385 yield chunk
387 self._verbosenote(_('%8.i (changelog)\n') % size)
386 self._verbosenote(_('%8.i (changelog)\n') % size)
388
387
388 fastpathlinkrev = fastpathlinkrev and not self._reorder
389 # Callback for the manifest, used to collect linkrevs for filelog
389 # Callback for the manifest, used to collect linkrevs for filelog
390 # revisions.
390 # revisions.
391 # Returns the linkrev node (collected in lookupcl).
391 # Returns the linkrev node (collected in lookupcl).
392 def lookupmf(x):
392 def lookupmf(x):
393 clnode = mfs[x]
393 clnode = mfs[x]
394 if not fastpathlinkrev or reorder:
394 if not fastpathlinkrev:
395 mdata = ml.readfast(x)
395 mdata = ml.readfast(x)
396 for f, n in mdata.iteritems():
396 for f, n in mdata.iteritems():
397 if f in changedfiles:
397 if f in changedfiles:
@@ -414,7 +414,7 b' class cg1packer(object):'
414 clrevs = set(cl.rev(x) for x in clnodes)
414 clrevs = set(cl.rev(x) for x in clnodes)
415
415
416 def linknodes(filerevlog, fname):
416 def linknodes(filerevlog, fname):
417 if fastpathlinkrev and not reorder:
417 if fastpathlinkrev:
418 llr = filerevlog.linkrev
418 llr = filerevlog.linkrev
419 def genfilenodes():
419 def genfilenodes():
420 for r in filerevlog:
420 for r in filerevlog:
General Comments 0
You need to be logged in to leave comments. Login now