Merge lp:~jelmer/brz/progressbar-context into lp:brz

[Jelmer Vernooij]

Use contexts for progress bars where possible.

Use contexts for progress bars where possible.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/312/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/317/

=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2019-06-02 21:07:08 +0000
+++ breezy/bzr/bzrdir.py	2019-06-06 21:52:30 +0000
@@ -1734,73 +1734,72 @@
     def convert(self, to_convert, pb):
         """See Converter.convert()."""
         self.controldir = to_convert
-        self.pb = ui.ui_factory.nested_progress_bar()
-        self.count = 0
-        self.total = 1
-        self.step('checking repository format')
-        try:
-            repo = self.controldir.open_repository()
-        except errors.NoRepositoryPresent:
-            pass
-        else:
-            repo_fmt = self.target_format.repository_format
-            if not isinstance(repo._format, repo_fmt.__class__):
-                from ..repository import CopyConverter
-                ui.ui_factory.note(gettext('starting repository conversion'))
-                if not repo_fmt.supports_overriding_transport:
-                    raise AssertionError(
-                        "Repository in metadir does not support "
-                        "overriding transport")
-                converter = CopyConverter(self.target_format.repository_format)
-                converter.convert(repo, pb)
-        for branch in self.controldir.list_branches():
-            # TODO: conversions of Branch and Tree should be done by
-            # InterXFormat lookups/some sort of registry.
-            # Avoid circular imports
-            old = branch._format.__class__
-            new = self.target_format.get_branch_format().__class__
-            while old != new:
-                if (old == fullhistorybranch.BzrBranchFormat5
-                    and new in (_mod_bzrbranch.BzrBranchFormat6,
-                                _mod_bzrbranch.BzrBranchFormat7,
-                                _mod_bzrbranch.BzrBranchFormat8)):
-                    branch_converter = _mod_bzrbranch.Converter5to6()
-                elif (old == _mod_bzrbranch.BzrBranchFormat6
-                      and new in (_mod_bzrbranch.BzrBranchFormat7,
-                                  _mod_bzrbranch.BzrBranchFormat8)):
-                    branch_converter = _mod_bzrbranch.Converter6to7()
-                elif (old == _mod_bzrbranch.BzrBranchFormat7
-                      and new is _mod_bzrbranch.BzrBranchFormat8):
-                    branch_converter = _mod_bzrbranch.Converter7to8()
-                else:
-                    raise errors.BadConversionTarget("No converter", new,
-                                                     branch._format)
-                branch_converter.convert(branch)
-                branch = self.controldir.open_branch()
+        with ui.ui_factory.nested_progress_bar() as self.pb:
+            self.count = 0
+            self.total = 1
+            self.step('checking repository format')
+            try:
+                repo = self.controldir.open_repository()
+            except errors.NoRepositoryPresent:
+                pass
+            else:
+                repo_fmt = self.target_format.repository_format
+                if not isinstance(repo._format, repo_fmt.__class__):
+                    from ..repository import CopyConverter
+                    ui.ui_factory.note(gettext('starting repository conversion'))
+                    if not repo_fmt.supports_overriding_transport:
+                        raise AssertionError(
+                            "Repository in metadir does not support "
+                            "overriding transport")
+                    converter = CopyConverter(self.target_format.repository_format)
+                    converter.convert(repo, pb)
+            for branch in self.controldir.list_branches():
+                # TODO: conversions of Branch and Tree should be done by
+                # InterXFormat lookups/some sort of registry.
+                # Avoid circular imports
                 old = branch._format.__class__
-        try:
-            tree = self.controldir.open_workingtree(recommend_upgrade=False)
-        except (errors.NoWorkingTree, errors.NotLocalUrl):
-            pass
-        else:
-            # TODO: conversions of Branch and Tree should be done by
-            # InterXFormat lookups
-            if (isinstance(tree, workingtree_3.WorkingTree3)
-                and not isinstance(tree, workingtree_4.DirStateWorkingTree)
-                and isinstance(self.target_format.workingtree_format,
-                               workingtree_4.DirStateWorkingTreeFormat)):
-                workingtree_4.Converter3to4().convert(tree)
-            if (isinstance(tree, workingtree_4.DirStateWorkingTree)
-                and not isinstance(tree, workingtree_4.WorkingTree5)
-                and isinstance(self.target_format.workingtree_format,
-                               workingtree_4.WorkingTreeFormat5)):
-                workingtree_4.Converter4to5().convert(tree)
-            if (isinstance(tree, workingtree_4.DirStateWorkingTree)
-                and not isinstance(tree, workingtree_4.WorkingTree6)
-                and isinstance(self.target_format.workingtree_format,
-                               workingtree_4.WorkingTreeFormat6)):
-                workingtree_4.Converter4or5to6().convert(tree)
-        self.pb.finished()
+                new = self.target_format.get_branch_format().__class__
+                while old != new:
+                    if (old == fullhistorybranch.BzrBranchFormat5
+                        and new in (_mod_bzrbranch.BzrBranchFormat6,
+                                    _mod_bzrbranch.BzrBranchFormat7,
+                                    _mod_bzrbranch.BzrBranchFormat8)):
+                        branch_converter = _mod_bzrbranch.Converter5to6()
+                    elif (old == _mod_bzrbranch.BzrBranchFormat6
+                          and new in (_mod_bzrbranch.BzrBranchFormat7,
+                                      _mod_bzrbranch.BzrBranchFormat8)):
+                        branch_converter = _mod_bzrbranch.Converter6to7()
+                    elif (old == _mod_bzrbranch.BzrBranchFormat7
+                          and new is _mod_bzrbranch.BzrBranchFormat8):
+                        branch_converter = _mod_bzrbranch.Converter7to8()
+                    else:
+                        raise errors.BadConversionTarget("No converter", new,
+                                                         branch._format)
+                    branch_converter.convert(branch)
+                    branch = self.controldir.open_branch()
+                    old = branch._format.__class__
+            try:
+                tree = self.controldir.open_workingtree(recommend_upgrade=False)
+            except (errors.NoWorkingTree, errors.NotLocalUrl):
+                pass
+            else:
+                # TODO: conversions of Branch and Tree should be done by
+                # InterXFormat lookups
+                if (isinstance(tree, workingtree_3.WorkingTree3)
+                    and not isinstance(tree, workingtree_4.DirStateWorkingTree)
+                    and isinstance(self.target_format.workingtree_format,
+                                   workingtree_4.DirStateWorkingTreeFormat)):
+                    workingtree_4.Converter3to4().convert(tree)
+                if (isinstance(tree, workingtree_4.DirStateWorkingTree)
+                    and not isinstance(tree, workingtree_4.WorkingTree5)
+                    and isinstance(self.target_format.workingtree_format,
+                                   workingtree_4.WorkingTreeFormat5)):
+                    workingtree_4.Converter4to5().convert(tree)
+                if (isinstance(tree, workingtree_4.DirStateWorkingTree)
+                    and not isinstance(tree, workingtree_4.WorkingTree6)
+                    and isinstance(self.target_format.workingtree_format,
+                                   workingtree_4.WorkingTreeFormat6)):
+                    workingtree_4.Converter4or5to6().convert(tree)
         return to_convert
 
 

=== modified file 'breezy/bzr/groupcompress_repo.py'
--- breezy/bzr/groupcompress_repo.py	2018-11-30 12:39:04 +0000
+++ breezy/bzr/groupcompress_repo.py	2019-06-06 21:52:30 +0000
@@ -1270,35 +1270,34 @@
                 yield record
 
         revision_ids = search.get_keys()
-        pb = ui.ui_factory.nested_progress_bar()
-        rc = self._record_counter
-        self._record_counter.setup(len(revision_ids))
-        for stream_info in self._fetch_revision_texts(revision_ids):
-            yield (stream_info[0],
-                   wrap_and_count(pb, rc, stream_info[1]))
-        self._revision_keys = [(rev_id,) for rev_id in revision_ids]
-        # TODO: The keys to exclude might be part of the search recipe
-        # For now, exclude all parents that are at the edge of ancestry, for
-        # which we have inventories
-        from_repo = self.from_repository
-        parent_keys = from_repo._find_parent_keys_of_revisions(
-            self._revision_keys)
-        self.from_repository.revisions.clear_cache()
-        self.from_repository.signatures.clear_cache()
-        # Clear the repo's get_parent_map cache too.
-        self.from_repository._unstacked_provider.disable_cache()
-        self.from_repository._unstacked_provider.enable_cache()
-        s = self._get_inventory_stream(self._revision_keys)
-        yield (s[0], wrap_and_count(pb, rc, s[1]))
-        self.from_repository.inventories.clear_cache()
-        for stream_info in self._get_filtered_chk_streams(parent_keys):
-            yield (stream_info[0], wrap_and_count(pb, rc, stream_info[1]))
-        self.from_repository.chk_bytes.clear_cache()
-        s = self._get_text_stream()
-        yield (s[0], wrap_and_count(pb, rc, s[1]))
-        self.from_repository.texts.clear_cache()
-        pb.update('Done', rc.max, rc.max)
-        pb.finished()
+        with ui.ui_factory.nested_progress_bar() as pb:
+            rc = self._record_counter
+            self._record_counter.setup(len(revision_ids))
+            for stream_info in self._fetch_revision_texts(revision_ids):
+                yield (stream_info[0],
+                       wrap_and_count(pb, rc, stream_info[1]))
+            self._revision_keys = [(rev_id,) for rev_id in revision_ids]
+            # TODO: The keys to exclude might be part of the search recipe
+            # For now, exclude all parents that are at the edge of ancestry, for
+            # which we have inventories
+            from_repo = self.from_repository
+            parent_keys = from_repo._find_parent_keys_of_revisions(
+                self._revision_keys)
+            self.from_repository.revisions.clear_cache()
+            self.from_repository.signatures.clear_cache()
+            # Clear the repo's get_parent_map cache too.
+            self.from_repository._unstacked_provider.disable_cache()
+            self.from_repository._unstacked_provider.enable_cache()
+            s = self._get_inventory_stream(self._revision_keys)
+            yield (s[0], wrap_and_count(pb, rc, s[1]))
+            self.from_repository.inventories.clear_cache()
+            for stream_info in self._get_filtered_chk_streams(parent_keys):
+                yield (stream_info[0], wrap_and_count(pb, rc, stream_info[1]))
+            self.from_repository.chk_bytes.clear_cache()
+            s = self._get_text_stream()
+            yield (s[0], wrap_and_count(pb, rc, s[1]))
+            self.from_repository.texts.clear_cache()
+            pb.update('Done', rc.max, rc.max)
 
     def get_stream_for_missing_keys(self, missing_keys):
         # missing keys can only occur when we are byte copying and not

=== modified file 'breezy/git/commands.py'
--- breezy/git/commands.py	2019-04-06 12:51:43 +0000
+++ breezy/git/commands.py	2019-06-06 21:52:30 +0000
@@ -130,8 +130,7 @@
         interrepo = InterRepository.get(source_repo, target_repo)
         mapping = source_repo.get_mapping()
         refs = interrepo.fetch()
-        pb = ui.ui_factory.nested_progress_bar()
-        try:
+        with ui.ui_factory.nested_progress_bar() as pb:
             for i, (name, sha) in enumerate(viewitems(refs)):
                 try:
                     branch_name = ref_to_branch_name(name)
@@ -159,8 +158,6 @@
                         source_branch.base,
                         {"branch": urlutils.escape(branch_name)})
                     head_branch.set_parent(url)
-        finally:
-            pb.finished()
         trace.note(gettext(
             "Use 'bzr checkout' to create a working tree in "
             "the newly created branches."))

=== modified file 'breezy/git/interrepo.py'
--- breezy/git/interrepo.py	2018-11-16 23:15:15 +0000
+++ breezy/git/interrepo.py	2019-06-06 21:52:30 +0000
@@ -216,8 +216,7 @@
                 stop_revids.append(revid)
         missing = set()
         graph = self.source.get_graph()
-        pb = ui.ui_factory.nested_progress_bar()
-        try:
+        with ui.ui_factory.nested_progress_bar() as pb:
             while stop_revids:
                 new_stop_revids = []
                 for revid in stop_revids:
@@ -231,8 +230,6 @@
                 for parent_revids in viewvalues(parent_map):
                     stop_revids.update(parent_revids)
                 pb.update("determining revisions to fetch", len(missing))
-        finally:
-            pb.finished()
         return graph.iter_topo_order(missing)
 
     def _get_target_bzr_refs(self):
@@ -302,8 +299,7 @@
         with self.source_store.lock_read():
             todo = list(self.missing_revisions(revs))[:limit]
             revidmap = {}
-            pb = ui.ui_factory.nested_progress_bar()
-            try:
+            with ui.ui_factory.nested_progress_bar() as pb:
                 object_generator = MissingObjectsIterator(
                     self.source_store, self.source, pb)
                 for (old_revid, git_sha) in object_generator.import_revisions(
@@ -321,8 +317,6 @@
                     revidmap[old_revid] = (git_sha, new_revid)
                 self.target_store.add_objects(object_generator)
                 return revidmap
-            finally:
-                pb.finished()
 
     def fetch(self, revision_id=None, pb=None, find_ghosts=False,
               fetch_spec=None, mapped_refs=None):
@@ -574,8 +568,7 @@
                 lambda sha: store[sha].parents)
             wants_recorder = DetermineWantsRecorder(determine_wants)
 
-            pb = ui.ui_factory.nested_progress_bar()
-            try:
+            with ui.ui_factory.nested_progress_bar() as pb:
                 objects_iter = self.source.fetch_objects(
                     wants_recorder, graph_walker, store.get_raw)
                 trace.mutter("Importing %d new revisions",
@@ -584,8 +577,6 @@
                     self.target, mapping, objects_iter, store,
                     wants_recorder.wants, pb, limit)
                 return (pack_hint, last_rev, wants_recorder.remote_refs)
-            finally:
-                pb.finished()
 
     @staticmethod
     def is_compatible(source, target):
@@ -610,9 +601,8 @@
         self._warn_slow()
         remote_refs = self.source.controldir.get_refs_container().as_dict()
         wants = determine_wants(remote_refs)
-        pb = ui.ui_factory.nested_progress_bar()
         target_git_object_retriever = get_object_store(self.target, mapping)
-        try:
+        with ui.ui_factory.nested_progress_bar() as pb:
             target_git_object_retriever.lock_write()
             try:
                 (pack_hint, last_rev) = import_git_objects(
@@ -621,8 +611,6 @@
                 return (pack_hint, last_rev, remote_refs)
             finally:
                 target_git_object_retriever.unlock()
-        finally:
-            pb.finished()
 
     @staticmethod
     def is_compatible(source, target):
@@ -726,14 +714,11 @@
         if limit is not None:
             raise FetchLimitUnsupported(self)
         from .remote import DefaultProgressReporter
-        pb = ui.ui_factory.nested_progress_bar()
-        progress = DefaultProgressReporter(pb).progress
-        try:
+        with ui.ui_factory.nested_progress_bar() as pb:
+            progress = DefaultProgressReporter(pb).progress
             refs = self.source._git.fetch(
                 self.target._git, determine_wants,
                 progress=progress)
-        finally:
-            pb.finished()
         return (None, None, refs)
 
     @staticmethod

=== modified file 'breezy/git/object_store.py'
--- breezy/git/object_store.py	2019-04-14 03:19:31 +0000
+++ breezy/git/object_store.py	2019-06-06 21:52:30 +0000
@@ -457,15 +457,12 @@
             return
         self.start_write_group()
         try:
-            pb = ui.ui_factory.nested_progress_bar()
-            try:
+            with ui.ui_factory.nested_progress_bar() as pb:
                 for i, revid in enumerate(graph.iter_topo_order(
                         missing_revids)):
                     trace.mutter('processing %r', revid)
                     pb.update("updating git map", i, len(missing_revids))
                     self._update_sha_map_revision(revid)
-            finally:
-                pb.finished()
             if stop_revision is None:
                 self._map_updated = True
         except BaseException:
@@ -824,8 +821,7 @@
         graph = self.repository.get_graph()
         todo = _find_missing_bzr_revids(graph, pending, processed)
         ret = PackTupleIterable(self)
-        pb = ui.ui_factory.nested_progress_bar()
-        try:
+        with ui.ui_factory.nested_progress_bar() as pb:
             for i, revid in enumerate(graph.iter_topo_order(todo)):
                 pb.update("generating git objects", i, len(todo))
                 try:
@@ -837,8 +833,6 @@
                         rev, tree, lossy=lossy):
                     ret.add(obj.id, path)
             return ret
-        finally:
-            pb.finished()
 
     def add_thin_pack(self):
         import tempfile

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2019-06-02 05:13:10 +0000
+++ breezy/git/remote.py	2019-06-06 21:52:30 +0000
@@ -652,14 +652,10 @@
 
     def _idx_load_or_generate(self, path):
         if not os.path.exists(path):
-            pb = ui.ui_factory.nested_progress_bar()
-            try:
+            with ui.ui_factory.nested_progress_bar() as pb:
                 def report_progress(cur, total):
                     pb.update("generating index", cur, total)
-                self.data.create_index(path,
-                                       progress=report_progress)
-            finally:
-                pb.finished()
+                self.data.create_index(path, progress=report_progress)
         return load_pack_index(path)
 
     def __del__(self):

=== modified file 'breezy/git/repository.py'
--- breezy/git/repository.py	2019-02-11 19:40:51 +0000
+++ breezy/git/repository.py	2019-06-06 21:52:30 +0000
@@ -516,8 +516,7 @@
             except KeyError:
                 # Update refs from Git commit objects
                 # FIXME: Hitting this a lot will be very inefficient...
-                pb = ui.ui_factory.nested_progress_bar()
-                try:
+                with ui.ui_factory.nested_progress_bar() as pb:
                     for i, (git_sha, revid, roundtrip_revid) in enumerate(
                             self._iter_revision_ids()):
                         if not roundtrip_revid:
@@ -527,8 +526,6 @@
                         self._git.refs[refname] = git_sha
                         if roundtrip_revid == bzr_revid:
                             return git_sha, mapping
-                finally:
-                    pb.finished()
                 raise errors.NoSuchRevision(self, bzr_revid)
         else:
             return (git_sha, mapping)

=== modified file 'breezy/plugins/repodebug/check_chk.py'
--- breezy/plugins/repodebug/check_chk.py	2017-09-07 08:21:29 +0000
+++ breezy/plugins/repodebug/check_chk.py	2019-06-06 21:52:30 +0000
@@ -59,24 +59,23 @@
             r1 = revision[0].as_revision_id(branch)
             r2 = revision[1].as_revision_id(branch)
             inv_ids = g.find_unique_ancestors(r2, [r1])
-        pb = ui.ui_factory.nested_progress_bar()
-        self.add_cleanup(pb.finished)
-        for idx, inv in enumerate(repo.iter_inventories(inv_ids)):
-            pb.update('checking', idx, len(inv_ids))
-            d = dict(inv.id_to_entry.iteritems())
-            test_key = chk_map.CHKMap.from_dict(
-                vf, d, maximum_size=inv.id_to_entry._root_node._maximum_size,
-                key_width=inv.id_to_entry._root_node._key_width,
-                search_key_func=inv.id_to_entry._search_key_func)
-            if inv.id_to_entry.key() != test_key:
-                trace.warning('Failed for id_to_entry inv: %s'
-                              % (inv.revision_id,))
-            pid = inv.parent_id_basename_to_file_id
-            d = dict(pid.iteritems())
-            test_key = chk_map.CHKMap.from_dict(
-                vf, d, maximum_size=pid._root_node._maximum_size,
-                key_width=pid._root_node._key_width,
-                search_key_func=pid._search_key_func)
-            if pid.key() != test_key:
-                trace.warning('Failed for parent_id_to_basename inv: %s'
-                              % (inv.revision_id,))
+        with ui.ui_factory.nested_progress_bar() as pb:
+            for idx, inv in enumerate(repo.iter_inventories(inv_ids)):
+                pb.update('checking', idx, len(inv_ids))
+                d = dict(inv.id_to_entry.iteritems())
+                test_key = chk_map.CHKMap.from_dict(
+                    vf, d, maximum_size=inv.id_to_entry._root_node._maximum_size,
+                    key_width=inv.id_to_entry._root_node._key_width,
+                    search_key_func=inv.id_to_entry._search_key_func)
+                if inv.id_to_entry.key() != test_key:
+                    trace.warning('Failed for id_to_entry inv: %s'
+                                  % (inv.revision_id,))
+                pid = inv.parent_id_basename_to_file_id
+                d = dict(pid.iteritems())
+                test_key = chk_map.CHKMap.from_dict(
+                    vf, d, maximum_size=pid._root_node._maximum_size,
+                    key_width=pid._root_node._key_width,
+                    search_key_func=pid._search_key_func)
+                if pid.key() != test_key:
+                    trace.warning('Failed for parent_id_to_basename inv: %s'
+                                  % (inv.revision_id,))

=== modified file 'breezy/reconcile.py'
--- breezy/reconcile.py	2019-01-01 21:56:21 +0000
+++ breezy/reconcile.py	2019-06-06 21:52:30 +0000
@@ -25,7 +25,6 @@
 
 
 from . import (
-    cleanup,
     errors,
     ui,
     )