Show More
@@ -366,8 +366,9 b' def stripmanifest(repo, striprev, tr, fi' | |||||
366 | striptrees(repo, tr, striprev, files) |
|
366 | striptrees(repo, tr, striprev, files) | |
367 |
|
367 | |||
368 | def striptrees(repo, tr, striprev, files): |
|
368 | def striptrees(repo, tr, striprev, files): | |
369 |
if 'treemanifest' in repo.requirements: |
|
369 | if 'treemanifest' in repo.requirements: | |
370 | # otherwise |
|
370 | # This logic is safe if treemanifest isn't enabled, but also | |
|
371 | # pointless, so we skip it if treemanifest isn't enabled. | |||
371 | for unencoded, encoded, size in repo.store.datafiles(): |
|
372 | for unencoded, encoded, size in repo.store.datafiles(): | |
372 | if (unencoded.startswith('meta/') and |
|
373 | if (unencoded.startswith('meta/') and | |
373 | unencoded.endswith('00manifest.i')): |
|
374 | unencoded.endswith('00manifest.i')): | |
@@ -418,7 +419,9 b' def rebuildfncache(ui, repo):' | |||||
418 |
|
419 | |||
419 | progress.complete() |
|
420 | progress.complete() | |
420 |
|
421 | |||
421 |
if 'treemanifest' in repo.requirements: |
|
422 | if 'treemanifest' in repo.requirements: | |
|
423 | # This logic is safe if treemanifest isn't enabled, but also | |||
|
424 | # pointless, so we skip it if treemanifest isn't enabled. | |||
422 | for dir in util.dirs(seenfiles): |
|
425 | for dir in util.dirs(seenfiles): | |
423 | i = 'meta/%s/00manifest.i' % dir |
|
426 | i = 'meta/%s/00manifest.i' % dir | |
424 | d = 'meta/%s/00manifest.d' % dir |
|
427 | d = 'meta/%s/00manifest.d' % dir |
General Comments 0
You need to be logged in to leave comments.
Login now