Show More
@@ -516,7 +516,6 b' class cg1packer(object):' | |||
|
516 | 516 | reorder = stringutil.parsebool(reorder) |
|
517 | 517 | self._repo = repo |
|
518 | 518 | self._reorder = reorder |
|
519 | self._progress = repo.ui.progress | |
|
520 | 519 | if self._repo.ui.verbose and not self._repo.ui.debugflag: |
|
521 | 520 | self._verbosenote = self._repo.ui.note |
|
522 | 521 | else: |
@@ -565,18 +564,20 b' class cg1packer(object):' | |||
|
565 | 564 | revs.insert(0, p) |
|
566 | 565 | |
|
567 | 566 | # build deltas |
|
568 | total = len(revs) - 1 | |
|
569 | msgbundling = _('bundling') | |
|
567 | progress = None | |
|
568 | if units is not None: | |
|
569 | progress = self._repo.ui.makeprogress(_('bundling'), unit=units, | |
|
570 | total=(len(revs) - 1)) | |
|
570 | 571 | for r in xrange(len(revs) - 1): |
|
571 |
if |
|
|
572 | self._progress(msgbundling, r + 1, unit=units, total=total) | |
|
572 | if progress: | |
|
573 | progress.update(r + 1) | |
|
573 | 574 | prev, curr = revs[r], revs[r + 1] |
|
574 | 575 | linknode = lookup(revlog.node(curr)) |
|
575 | 576 | for c in self.revchunk(revlog, curr, prev, linknode): |
|
576 | 577 | yield c |
|
577 | 578 | |
|
578 | if units is not None: | |
|
579 | self._progress(msgbundling, None) | |
|
579 | if progress: | |
|
580 | progress.complete() | |
|
580 | 581 | yield self.close() |
|
581 | 582 | |
|
582 | 583 | # filter any nodes that claim to be part of the known set |
@@ -742,12 +743,8 b' class cg1packer(object):' | |||
|
742 | 743 | # The 'source' parameter is useful for extensions |
|
743 | 744 | def generatefiles(self, changedfiles, linknodes, commonrevs, source): |
|
744 | 745 | repo = self._repo |
|
745 | progress = self._progress | |
|
746 | msgbundling = _('bundling') | |
|
747 | ||
|
748 | total = len(changedfiles) | |
|
749 | # for progress output | |
|
750 | msgfiles = _('files') | |
|
746 | progress = repo.ui.makeprogress(_('bundling'), unit=_('files'), | |
|
747 | total=len(changedfiles)) | |
|
751 | 748 | for i, fname in enumerate(sorted(changedfiles)): |
|
752 | 749 | filerevlog = repo.file(fname) |
|
753 | 750 | if not filerevlog: |
@@ -762,8 +759,7 b' class cg1packer(object):' | |||
|
762 | 759 | |
|
763 | 760 | filenodes = self.prune(filerevlog, linkrevnodes, commonrevs) |
|
764 | 761 | if filenodes: |
|
765 |
progress( |
|
|
766 | total=total) | |
|
762 | progress.update(i + 1, item=fname) | |
|
767 | 763 | h = self.fileheader(fname) |
|
768 | 764 | size = len(h) |
|
769 | 765 | yield h |
@@ -771,7 +767,7 b' class cg1packer(object):' | |||
|
771 | 767 | size += len(chunk) |
|
772 | 768 | yield chunk |
|
773 | 769 | self._verbosenote(_('%8.i %s\n') % (size, fname)) |
|
774 | progress(msgbundling, None) | |
|
770 | progress.complete() | |
|
775 | 771 | |
|
776 | 772 | def deltaparent(self, revlog, rev, p1, p2, prev): |
|
777 | 773 | if not revlog.candelta(prev, rev): |
General Comments 0
You need to be logged in to leave comments.
Login now