Merge lp:brz/3.3

by jelmer review by jelmer
breezy-team · Sep 29, 2023 · 1166301 · 1166301
2 parents be110c2 + 182808d
commit 1166301
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -320,6 +320,7 @@ check-dist-tarball:
 	rm -rf $$tmpdir
 
 reformat:
+	isort .
 	find breezy crates  -name '*.rs' | xargs rustfmt
 
 clippy-fix:
@@ -336,3 +337,9 @@ ruff-fix:
 
 fix: clippy ruff-fix
 	$(MAKE) reformat
+
+.testrepository:
+	testr init
+
+testr: .testrepository all
+	testr run --parallel
diff --git a/breezy/bzr/tests/test_testament.py b/breezy/bzr/tests/test_testament.py
@@ -31,7 +31,7 @@ class TestamentSetup(TestCaseWithTransport):
 
     def setUp(self):
         super().setUp()
-        self.wt = self.make_branch_and_tree('.', format='development-subtree')
+        self.wt = self.make_branch_and_tree('.')
         self.wt.set_root_id(b'TREE_ROT')
         b = self.b = self.wt.branch
         b.nick = "test branch"

diff --git a/breezy/plugins/bash_completion/tests/test_bashcomp.py b/breezy/plugins/bash_completion/tests/test_bashcomp.py
@@ -177,7 +177,7 @@ def get_script(self):
 
     def test_revspec_tag_all(self):
         self.requireFeature(features.sed_feature)
-        wt = self.make_branch_and_tree('.', format='dirstate-tags')
+        wt = self.make_branch_and_tree('.')
         wt.branch.tags.set_tag('tag1', b'null:')
         wt.branch.tags.set_tag('tag2', b'null:')
         wt.branch.tags.set_tag('3tag', b'null:')
@@ -186,7 +186,7 @@ def test_revspec_tag_all(self):
 
     def test_revspec_tag_prefix(self):
         self.requireFeature(features.sed_feature)
-        wt = self.make_branch_and_tree('.', format='dirstate-tags')
+        wt = self.make_branch_and_tree('.')
         wt.branch.tags.set_tag('tag1', b'null:')
         wt.branch.tags.set_tag('tag2', b'null:')
         wt.branch.tags.set_tag('3tag', b'null:')
@@ -195,7 +195,7 @@ def test_revspec_tag_prefix(self):
 
     def test_revspec_tag_spaces(self):
         self.requireFeature(features.sed_feature)
-        wt = self.make_branch_and_tree('.', format='dirstate-tags')
+        wt = self.make_branch_and_tree('.')
         wt.branch.tags.set_tag('tag with spaces', b'null:')
         self.complete(['brz', 'log', '-r', 'tag', ':', 't'])
         self.assertCompletionEquals(r'tag\ with\ spaces')
@@ -206,7 +206,7 @@ def test_revspec_tag_spaces(self):
 
     def test_revspec_tag_endrange(self):
         self.requireFeature(features.sed_feature)
-        wt = self.make_branch_and_tree('.', format='dirstate-tags')
+        wt = self.make_branch_and_tree('.')
         wt.branch.tags.set_tag('tag1', b'null:')
         wt.branch.tags.set_tag('tag2', b'null:')
         self.complete(['brz', 'log', '-r', '3..tag', ':', 't'])

diff --git a/breezy/tests/blackbox/test_branch.py b/breezy/tests/blackbox/test_branch.py
@@ -482,8 +482,7 @@ def test_branch_stacked_branch_stacked(self):
 
     def test_branch_stacked(self):
         # We have a mainline
-        trunk_tree = self.make_branch_and_tree('mainline',
-                                               format='1.9')
+        trunk_tree = self.make_branch_and_tree('mainline')
         original_revid = trunk_tree.commit('mainline')
         self.assertRevisionInRepository('mainline', original_revid)
         # and a branch from it which is stacked

diff --git a/breezy/tests/blackbox/test_reference.py b/breezy/tests/blackbox/test_reference.py
@@ -22,7 +22,7 @@
 class TestReference(TestCaseWithTransport):
 
     def get_default_format(self):
-        return controldir.format_registry.make_controldir('development-subtree')
+        return controldir.format_registry.make_controldir('2a')
 
     def test_no_args_lists(self):
         tree = self.make_branch_and_tree('branch')