Show More
@@ -560,6 +560,12 b' def _makemap(repo):' | |||||
560 | def _emit2(repo, entries, totalfilesize): |
|
560 | def _emit2(repo, entries, totalfilesize): | |
561 | """actually emit the stream bundle""" |
|
561 | """actually emit the stream bundle""" | |
562 | vfsmap = _makemap(repo) |
|
562 | vfsmap = _makemap(repo) | |
|
563 | # we keep repo.vfs out of the on purpose, ther are too many danger there | |||
|
564 | # (eg: .hg/hgrc), | |||
|
565 | # | |||
|
566 | # this assert is duplicated (from _makemap) as author might think this is | |||
|
567 | # fine, while this is really not fine. | |||
|
568 | assert repo.vfs not in vfsmap.values() | |||
563 | progress = repo.ui.makeprogress( |
|
569 | progress = repo.ui.makeprogress( | |
564 | _(b'bundle'), total=totalfilesize, unit=_(b'bytes') |
|
570 | _(b'bundle'), total=totalfilesize, unit=_(b'bytes') | |
565 | ) |
|
571 | ) | |
@@ -685,6 +691,12 b' def consumev2(repo, fp, filecount, files' | |||||
685 | progress.update(0) |
|
691 | progress.update(0) | |
686 |
|
692 | |||
687 | vfsmap = _makemap(repo) |
|
693 | vfsmap = _makemap(repo) | |
|
694 | # we keep repo.vfs out of the on purpose, ther are too many danger | |||
|
695 | # there (eg: .hg/hgrc), | |||
|
696 | # | |||
|
697 | # this assert is duplicated (from _makemap) as author might think this | |||
|
698 | # is fine, while this is really not fine. | |||
|
699 | assert repo.vfs not in vfsmap.values() | |||
688 |
|
700 | |||
689 | with repo.transaction(b'clone'): |
|
701 | with repo.transaction(b'clone'): | |
690 | ctxs = (vfs.backgroundclosing(repo.ui) for vfs in vfsmap.values()) |
|
702 | ctxs = (vfs.backgroundclosing(repo.ui) for vfs in vfsmap.values()) |
General Comments 0
You need to be logged in to leave comments.
Login now