launchpad-reviewers team mailing list archive

[Colin Watson <mp+413590@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
Upgrade to breezy 3.1.0

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

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

diff --git a/lib/lp/code/model/branchjob.py b/lib/lp/code/model/branchjob.py
index aa06aeb..296521d 100644
--- a/lib/lp/code/model/branchjob.py
+++ b/lib/lp/code/model/branchjob.py
@@ -904,10 +904,10 @@ class RosettaUploadJob(BranchJobDerived):
                 for file_names, changed_files in self._iter_all_lists():
                     for changed_file in to_tree.iter_changes(
                             from_tree, specific_files=file_names):
-                        (from_kind, to_kind) = changed_file[6]
+                        _, to_kind = changed_file.kind
                         if to_kind != 'file':
                             continue
-                        file_id, (from_path, to_path) = changed_file[:2]
+                        _, to_path = changed_file.path
                         changed_files.append((
                             to_path, to_tree.get_file_text(to_path)))
             finally:
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 321ff37..6322d9d 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -20,7 +20,7 @@ bcrypt==3.1.7
 beautifulsoup4==4.7.1
 billiard==3.6.4.0
 bleach==3.1.0
-breezy==3.0.1
+breezy==3.1.0
 bson==0.5.9
 boto3==1.16.63
 botocore==1.19.63
@@ -106,6 +106,7 @@ paramiko==2.4.1
 Paste==3.3.0
 PasteDeploy==2.1.0
 pathlib2==2.3.2
+patiencediff==0.2.2
 pgbouncer==0.0.9
 prettytable==0.7.2
 psutil==5.4.2
diff --git a/utilities/sourcedeps.cache b/utilities/sourcedeps.cache
index 6472450..4896b4b 100644
--- a/utilities/sourcedeps.cache
+++ b/utilities/sourcedeps.cache
@@ -4,8 +4,8 @@
         "jelmer@xxxxxxxxx-20200222161141-3tp7u18m15jqd4g8"
     ],
     "brz-loom": [
-        166,
-        "jelmer@xxxxxxxxx-20190822193925-ydrq7fgdi78lpgm7"
+        167,
+        "jelmer@xxxxxxxxx-20200530172546-539m8h6nngu17ydi"
     ],
     "difftacular": [
         11,
diff --git a/utilities/sourcedeps.conf b/utilities/sourcedeps.conf
index e1fc550..38c9a87 100644
--- a/utilities/sourcedeps.conf
+++ b/utilities/sourcedeps.conf
@@ -8,6 +8,6 @@
 #########################################################
 
 brz-builder lp:~jelmer/brz-builder/trunk;revno=183
-brz-loom lp:~jelmer/brz-loom/trunk;revno=166
+brz-loom lp:~jelmer/brz-loom/trunk;revno=167
 difftacular lp:~launchpad/difftacular/trunk;revno=11
 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=519