/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/multiparent.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/multiparent.py
403
403
            raise ValueError()
404
404
        revisions = set(vf.versions())
405
405
        total = len(revisions)
406
 
        pb = ui.ui_factory.nested_progress_bar()
407
 
        try:
 
406
        with ui.ui_factory.nested_progress_bar() as pb:
408
407
            while len(revisions) > 0:
409
408
                added = set()
410
409
                for revision in revisions:
430
429
                    pb.update(gettext('Importing revisions'),
431
430
                              (total - len(revisions)) + len(added), total)
432
431
                revisions = [r for r in revisions if r not in added]
433
 
        finally:
434
 
            pb.finished()
435
432
 
436
433
    def select_snapshots(self, vf):
437
434
        """Determine which versions to add as snapshots"""