Merge lp:~jelmer/brz/iter-branch into lp:brz

[Jelmer Vernooij]

Make Repository.find_branches an iterator.

Make Repository.find_branches an iterator.

[Martin Packman (gz)]

Thanks!

review: Approve

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

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

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

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

=== modified file 'breezy/check.py'
--- breezy/check.py	2018-11-11 04:08:32 +0000
+++ breezy/check.py	2019-07-07 17:24:41 +0000
@@ -119,7 +119,7 @@
         if repo is not None:
             repo.lock_read()
             to_unlock.append(repo)
-            branches = repo.find_branches(using=True)
+            branches = list(repo.find_branches(using=True))
             saw_tree = False
             if do_branch or do_tree:
                 for branch in branches:

=== modified file 'breezy/repository.py'
--- breezy/repository.py	2019-06-02 05:13:10 +0000
+++ breezy/repository.py	2019-07-07 17:24:41 +0000
@@ -564,7 +564,9 @@
         :param using: If True, list only branches using this repository.
         """
         if using and not self.is_shared():
-            return self.controldir.list_branches()
+            for branch in self.controldir.list_branches():
+                yield branch
+            return
 
         class Evaluator(object):
 
@@ -585,14 +587,14 @@
                 value = (controldir.list_branches(), None)
                 return True, value
 
-        ret = []
         for branches, repository in controldir.ControlDir.find_controldirs(
                 self.user_transport, evaluate=Evaluator()):
             if branches is not None:
-                ret.extend(branches)
+                for branch in branches:
+                    yield branch
             if not using and repository is not None:
-                ret.extend(repository.find_branches())
-        return ret
+                for branch in repository.find_branches():
+                    yield branch
 
     def search_missing_revision_ids(self, other,
                                     find_ghosts=True, revision_ids=None, if_present_ids=None,

=== modified file 'breezy/tests/per_repository/test_repository.py'
--- breezy/tests/per_repository/test_repository.py	2019-02-01 16:56:56 +0000
+++ breezy/tests/per_repository/test_repository.py	2019-07-07 17:24:41 +0000
@@ -800,7 +800,7 @@
 
     def test_find_branches(self):
         repo = self.make_repository_and_foo_bar()
-        branches = repo.find_branches()
+        branches = list(repo.find_branches())
         self.assertContainsRe(branches[-1].base, 'repository/foo/$')
         self.assertContainsRe(branches[-3].base, 'repository/baz/qux/$')
         self.assertContainsRe(branches[-2].base, 'repository/baz/qux/quxx/$')
@@ -818,7 +818,7 @@
             repo = self.make_repository_and_foo_bar(shared=True)
         except errors.IncompatibleFormat:
             raise tests.TestNotApplicable
-        branches = repo.find_branches(using=True)
+        branches = list(repo.find_branches(using=True))
         self.assertContainsRe(branches[-1].base, 'repository/foo/$')
         # in some formats, creating a repo creates a branch
         if len(branches) == 2:
@@ -847,7 +847,7 @@
         try:
             repo.controldir.open_branch()
         except errors.NotBranchError:
-            self.assertEqual([], repo.find_branches(using=True))
+            self.assertEqual([], list(repo.find_branches(using=True)))
         else:
             self.assertEqual([repo.controldir.root_transport.base],
                              [b.base for b in repo.find_branches(using=True)])

=== modified file 'breezy/upgrade.py'
--- breezy/upgrade.py	2018-11-11 04:08:32 +0000
+++ breezy/upgrade.py	2019-07-07 17:24:41 +0000
@@ -195,7 +195,7 @@
         # The URL is a repository. If it successfully upgrades,
         # then upgrade the dependent branches as well.
         if repo.is_shared():
-            dependents = repo.find_branches(using=True)
+            dependents = list(repo.find_branches(using=True))
 
     # Do the conversions
     attempted = [control_dir]

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2019-07-07 16:54:07 +0000
+++ doc/en/release-notes/brz-3.1.txt	2019-07-07 17:24:41 +0000
@@ -84,6 +84,9 @@
 * New ``Tree.get_transform`` method for getting a ``TreeTransform``
   object. (Jelmer Vernooij)
 
+* ``Repository.find_branches`` now returns an iterator rather than a
+  list. (Jelmer Vernooij, #413970)
+
 * New ``Tree.get_nested_tree`` method for retrieving a nested tree.
   (Jelmer Vernooij)