Merge lp:~jelmer/qbrz/trunk into lp:qbrz

[Jelmer Vernooij]

Some compatibility fixes for Breezy 3.2.

This reduces the number of test failures, but there are still some remaining.

Breezy 3.2 has updated the APIs to discourage use of file ids
(which don't exist for non-bzr formats). qbrz should probably be updated
to use paths rather than file ids as well.

[Robert Ladyman (saccadic-masking)]

Please go ahead and merge.

qbrz will need extensive changes I think - file ids are used throughout. ChangeDesc also has a different definition.

review: Approve

[lp:~jelmer/qbrz/trunk]

1641. By Jelmer Vernooij on 2021-05-26

Improve Breezy 3.2 compatibility.

=== modified file 'lib/diffwindow.py'
--- lib/diffwindow.py	2021-01-06 09:29:35 +0000
+++ lib/diffwindow.py	2021-05-26 19:12:34 +0000
@@ -32,7 +32,6 @@
 # from patiencediff import PatienceSequenceMatcher as SequenceMatcher
 from patiencediff import PatienceSequenceMatcher as SequenceMatcher
 from breezy.revisiontree import RevisionTree
-from breezy.transform import _PreviewTree
 from breezy.workingtree import WorkingTree
 from breezy.bzr.workingtree_4 import DirStateRevisionTree
 from breezy import trace
@@ -111,9 +110,6 @@
             else:
                 return gettext("Revid: %s") % revid
 
-    elif isinstance(tree, _PreviewTree):
-        return gettext('Merge Preview')
-
     # XXX I don't know what other cases we need to handle
     return 'Unknown tree'
 
 
=== modified file 'lib/tests/test_annotate.py'
--- lib/tests/test_annotate.py	2021-01-05 16:26:04 +0000
+++ lib/tests/test_annotate.py	2021-05-26 19:12:34 +0000
@@ -25,7 +25,7 @@
 
 from breezy.tests import TestCase, TestCaseWithTransport
 from PyQt5 import QtCore
-from breezy import conflicts
+from breezy.conflicts import ConflictList
 from breezy.plugins.qbrz.lib import tests as qtests
 from breezy.plugins.qbrz.lib.annotate import AnnotateWindow
 
@@ -58,11 +58,14 @@
         self.build_tree_contents([('tree2/a', b'first\nthird\n')])
         tree2.commit('c', rev_id=b'rev-1_1_1', committer="[e-mail]", timestamp=1166046002.00, timezone=0)
 
-        num_conflicts = tree1.merge_from_branch(tree2.branch)
-        self.assertEqual(1, num_conflicts)
+        conflicts = tree1.merge_from_branch(tree2.branch)
+        if isinstance(conflicts, int):  # brz < 3.2
+            self.assertEqual(1, conflicts)
+        else:
+            self.assertEqual(1, len(conflicts))
 
         self.build_tree_contents([('tree1/a', b'first\nsecond\nthird\n')])
-        tree1.set_conflicts(conflicts.ConflictList())
+        tree1.set_conflicts(ConflictList())
         tree1.commit('merge 2', rev_id=b'rev-3', committer='[e-mail]', timestamp=1166046003.00, timezone=0)
         return tree1, tree2
 
 
=== modified file 'lib/tests/test_treewidget.py'
--- lib/tests/test_treewidget.py	2021-01-06 11:13:35 +0000
+++ lib/tests/test_treewidget.py	2021-05-26 19:12:34 +0000
@@ -23,7 +23,6 @@
 from breezy.workingtree import WorkingTree
 from breezy.branch import Branch
 from breezy.controldir import ControlDir
-from breezy.conflicts import TextConflict, ConflictList
 from breezy import ignores
 
 from PyQt5 import QtCore
 
=== modified file 'lib/treewidget.py'
--- lib/treewidget.py	2021-01-08 16:50:52 +0000
+++ lib/treewidget.py	2021-05-26 19:12:34 +0000
@@ -20,6 +20,10 @@
 import os, sys
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+from breezy import errors
+from breezy.lazy_import import lazy_import
+from breezy.osutils import file_kind, minimum_path_selection
+
 from breezy.plugins.qbrz.lib.i18n import gettext
 
 from breezy.plugins.qbrz.lib.revtreeview import (
@@ -27,7 +31,6 @@
     RevNoItemDelegate,
     )
 from breezy.plugins.qbrz.lib.uifactory import ui_current_widget
-from breezy.lazy_import import lazy_import
 from breezy.plugins.qbrz.lib.lazycachedrevloader import cached_revisions
 from breezy.plugins.qbrz.lib.trace import report_exception, SUB_LOAD_METHOD
 
@@ -35,10 +38,8 @@
 import posixpath  # to use '/' path sep in path.join().
 from time import (strftime, localtime)
 
-from breezy import errors
 from breezy.workingtree import WorkingTree
 from breezy.revisiontree import RevisionTree
-from breezy.osutils import file_kind, minimum_path_selection
 from breezy.conflicts import TextConflict, resolve
 from breezy.tree import TreeChange
 
@@ -674,7 +675,7 @@
                 (kind, executable, stat_value) = self.tree._comparison_data(None, path)
                 child = InternalItem(name, kind, None)
                 is_ignored = self.tree.is_ignored(path)
-                t = TreeChange(None,(None, path), False, (False, False), (None, None), (None, name), (None, kind), (None, executable))
+                t = TreeChange((None, path), False, (False, False), (None, None), (None, name), (None, kind), (None, executable))
                 change = ChangeDesc(t, is_ignored)
 
                 # change = ChangeDesc((None,(None, path), False, (False, False), (None, None), (None, name), (None, kind),