/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/git/object_store.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-06 22:22:47 UTC
  • mfrom: (7143.22.4 progressbar-context)
  • Revision ID: breezy.the.bot@gmail.com-20190606222247-muw4nwibuoh9b30u
Use contexts for progress bars where possible.

Merged from https://code.launchpad.net/~jelmer/brz/progressbar-context/+merge/358460

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/object_store.py
457
457
            return
458
458
        self.start_write_group()
459
459
        try:
460
 
            pb = ui.ui_factory.nested_progress_bar()
461
 
            try:
 
460
            with ui.ui_factory.nested_progress_bar() as pb:
462
461
                for i, revid in enumerate(graph.iter_topo_order(
463
462
                        missing_revids)):
464
463
                    trace.mutter('processing %r', revid)
465
464
                    pb.update("updating git map", i, len(missing_revids))
466
465
                    self._update_sha_map_revision(revid)
467
 
            finally:
468
 
                pb.finished()
469
466
            if stop_revision is None:
470
467
                self._map_updated = True
471
468
        except BaseException:
824
821
        graph = self.repository.get_graph()
825
822
        todo = _find_missing_bzr_revids(graph, pending, processed)
826
823
        ret = PackTupleIterable(self)
827
 
        pb = ui.ui_factory.nested_progress_bar()
828
 
        try:
 
824
        with ui.ui_factory.nested_progress_bar() as pb:
829
825
            for i, revid in enumerate(graph.iter_topo_order(todo)):
830
826
                pb.update("generating git objects", i, len(todo))
831
827
                try:
837
833
                        rev, tree, lossy=lossy):
838
834
                    ret.add(obj.id, path)
839
835
            return ret
840
 
        finally:
841
 
            pb.finished()
842
836
 
843
837
    def add_thin_pack(self):
844
838
        import tempfile