launchpad-reviewers team mailing list archive

[Colin Watson <mp+427017@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:breezy-3.2.0 into launchpad:master.

Commit message:
Upgrade to breezy 3.2.0

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/427017

This is the latest version that supports Python 3.5.  (3.2.1 and 3.2.2 incorrectly claim to do so.)

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/427016
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:breezy-3.2.0 into launchpad:master.

diff --git a/lib/lp/code/model/directbranchcommit.py b/lib/lp/code/model/directbranchcommit.py
index dca1b05..ec6856d 100644
--- a/lib/lp/code/model/directbranchcommit.py
+++ b/lib/lp/code/model/directbranchcommit.py
@@ -12,11 +12,9 @@ __all__ = [
 import os.path
 
 from breezy.bzr.generate_ids import gen_file_id
+from breezy.bzr.transform import TransformPreview
 from breezy.revision import NULL_REVISION
-from breezy.transform import (
-    ROOT_PARENT,
-    TransformPreview,
-    )
+from breezy.transform import ROOT_PARENT
 import six
 
 from lp.code.errors import StaleLastMirrored
@@ -108,7 +106,7 @@ class DirectBranchCommit:
         try:
             self.revision_tree = self.bzrbranch.basis_tree()
             self.transform_preview = TransformPreview(self.revision_tree)
-            assert self.transform_preview.find_conflicts() == [], (
+            assert self.transform_preview.find_raw_conflicts() == [], (
                 "TransformPreview is not in a consistent state.")
             if not no_race_check:
                 last_revision = self.bzrbranch.last_revision()
diff --git a/lib/lp/testing/__init__.py b/lib/lp/testing/__init__.py
index bfc08cc..63a45fc 100644
--- a/lib/lp/testing/__init__.py
+++ b/lib/lp/testing/__init__.py
@@ -1389,8 +1389,7 @@ def map_branch_contents(branch):
     tree = branch.basis_tree()
     tree.lock_read()
     try:
-        for dir, entries in tree.walkdirs():
-            dirname, id = dir
+        for _, entries in tree.walkdirs():
             for entry in entries:
                 file_path, file_name, file_type = entry[:3]
                 if file_type == 'file':
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index f884e1a..38b4e60 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -21,7 +21,7 @@ beautifulsoup4==4.7.1
 billiard==3.6.4.0
 bleach==3.1.0
 bleach-allowlist==1.0.3
-breezy==3.1.0
+breezy==3.2.0
 bson==0.5.9
 boto3==1.16.63
 botocore==1.19.63