Merge lp:~jelmer/brz/user-url into lp:brz

[Jelmer Vernooij]

Consistently use Branch.user_url when referring to branch location.

Consistently use Branch.user_url when referring to branch location.

Previously, some code assumed that the branches' control directory's transport base would be at the same location, but that is not necessarily true in git.

[Martin Packman (gz)]

Looks good.

review: Approve

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-dev/4/

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2018-03-01 05:46:59 +0000
+++ breezy/branch.py	2018-03-04 17:01:53 +0000
@@ -1245,7 +1245,7 @@
             self.copy_content_into(result, revision_id=revision_id)
             master_url = self.get_bound_location()
             if master_url is None:
-                result.set_parent(self.controldir.root_transport.base)
+                result.set_parent(self.user_url)
             else:
                 result.set_parent(master_url)
         return result
 
=== modified file 'breezy/info.py'
--- breezy/info.py	2017-07-24 01:09:25 +0000
+++ breezy/info.py	2018-03-04 17:01:53 +0000
@@ -469,8 +469,8 @@
         if branch is None and tree is not None:
             phrase = "branchless tree"
         else:
-            if (tree is not None and tree.user_url !=
-                branch.user_url):
+            if (tree is not None and tree.controldir.control_url !=
+                branch.controldir.control_url):
                 independence = ''
                 phrase = "Lightweight checkout"
             elif branch.get_bound_location() is not None:
 
=== modified file 'breezy/tests/blackbox/test_branch.py'
--- breezy/tests/blackbox/test_branch.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/blackbox/test_branch.py	2018-03-04 17:01:53 +0000
@@ -81,7 +81,7 @@
         out, err = self.run_bzr(
             'init --format=development-colo file:b,branch=orig')
         self.assertEqual(
-            """Created a lightweight checkout (format: development-colo)\n""",
+            """Created a standalone tree (format: development-colo)\n""",
             out)
         self.assertEqual('', err)
         out, err = self.run_bzr(
 
=== modified file 'breezy/tests/blackbox/test_init.py'
--- breezy/tests/blackbox/test_init.py	2017-06-19 20:34:29 +0000
+++ breezy/tests/blackbox/test_init.py	2018-03-04 17:01:53 +0000
@@ -57,7 +57,7 @@
     def test_init_colocated(self):
         """Smoke test for constructing a colocated branch."""
         out, err = self.run_bzr('init --format=development-colo file:,branch=abranch')
-        self.assertEqual("""Created a lightweight checkout (format: development-colo)\n""",
+        self.assertEqual("""Created a standalone tree (format: development-colo)\n""",
             out)
         self.assertEqual('', err)
         out, err = self.run_bzr('branches')
 
=== modified file 'breezy/tests/per_branch/test_branch.py'
--- breezy/tests/per_branch/test_branch.py	2018-02-03 13:39:29 +0000
+++ breezy/tests/per_branch/test_branch.py	2018-03-04 17:01:53 +0000
@@ -162,7 +162,7 @@
         rev1 = wt_a.commit('commit one')
 
         branch_b = wt_a.branch.controldir.sprout('b', revision_id=rev1).open_branch()
-        self.assertEqual(wt_a.branch.base, branch_b.get_parent())
+        self.assertEqual(wt_a.branch.user_url, branch_b.get_parent())
         return branch_b
 
     def test_clone_branch_nickname(self):
@@ -649,7 +649,7 @@
             pass
         else:
             ref = this_branch._format.get_reference(this_branch.controldir)
-            self.assertEqual(ref, other_branch.base)
+            self.assertEqual(ref, other_branch.user_url)
 
     def test_format_initialize_find_open(self):
         # loopback test to check the current format initializes to itself.
@@ -1022,9 +1022,6 @@
         br = self.make_branch('branch')
         self.assertIsInstance(br.user_url, str)
         self.assertEqual(br.user_url, br.user_transport.base)
-        # for all current bzrdir implementations the user dir must be 
-        # above the control dir but we might need to relax that?
-        self.assertEqual(br.control_url.find(br.user_url), 0)
         self.assertEqual(br.control_url, br.control_transport.base)
 
 
 
=== modified file 'breezy/tests/per_branch/test_http.py'
--- breezy/tests/per_branch/test_http.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/per_branch/test_http.py	2018-03-04 17:01:53 +0000
@@ -75,4 +75,4 @@
         # from, even if that branch has an invalid parent.
         branch_b = self.get_branch_with_invalid_parent()
         branch_c = branch_b.controldir.sprout('c').open_branch()
-        self.assertEqual(branch_b.base, branch_c.get_parent())
+        self.assertEqual(branch_b.user_url, branch_c.get_parent())
 
=== modified file 'breezy/tests/per_branch/test_sprout.py'
--- breezy/tests/per_branch/test_sprout.py	2017-11-12 20:07:32 +0000
+++ breezy/tests/per_branch/test_sprout.py	2018-03-04 17:01:53 +0000
@@ -43,7 +43,7 @@
     def test_sprout_branch_parent(self):
         source = self.make_branch('source')
         target = source.controldir.sprout(self.get_url('target')).open_branch()
-        self.assertEqual(source.controldir.root_transport.base, target.get_parent())
+        self.assertEqual(source.user_url, target.get_parent())
 
     def test_sprout_uses_bzrdir_branch_format(self):
         # branch.sprout(bzrdir) is defined as using the branch format selected
 
=== modified file 'breezy/tests/per_controldir/test_controldir.py'
--- breezy/tests/per_controldir/test_controldir.py	2018-03-03 13:27:25 +0000
+++ breezy/tests/per_controldir/test_controldir.py	2018-03-04 17:01:53 +0000
@@ -450,9 +450,7 @@
             # this is ok too, not all formats have to support references.
             raise TestNotApplicable("control directory does not "
                 "support branch references")
-        self.assertEqual(
-            referenced_branch.controldir.root_transport.abspath('') + '/',
-            dir.get_branch_reference())
+        self.assertEqual(referenced_branch.user_url, dir.get_branch_reference())
 
     def test_set_branch_reference_on_existing_reference(self):
         """set_branch_reference creates a branch reference"""
@@ -467,7 +465,7 @@
                 "support branch references")
         reference = dir.set_branch_reference(referenced_branch2)
         self.assertEqual(
-            referenced_branch2.controldir.root_transport.abspath('') + '/',
+            referenced_branch2.user_url,
             dir.get_branch_reference())
 
     def test_set_branch_reference_on_existing_branch(self):
@@ -481,7 +479,7 @@
             raise TestNotApplicable("control directory does not "
                 "support branch references")
         self.assertEqual(
-            referenced_branch.controldir.root_transport.abspath('') + '/',
+            referenced_branch.user_url,
             dir.get_branch_reference())
 
     def test_get_branch_reference_on_reference(self):
@@ -494,7 +492,7 @@
             # this is ok too, not all formats have to support references.
             raise TestNotApplicable("control directory does not "
                 "support branch references")
-        self.assertEqual(referenced_branch.controldir.root_transport.abspath('') + '/',
+        self.assertEqual(referenced_branch.user_url,
             dir.get_branch_reference())
 
     def test_get_branch_reference_on_non_reference(self):
 
=== modified file 'breezy/tests/per_controldir_colo/test_supported.py'
--- breezy/tests/per_controldir_colo/test_supported.py	2017-06-10 00:52:08 +0000
+++ breezy/tests/per_controldir_colo/test_supported.py	2018-03-04 17:01:53 +0000
@@ -154,5 +154,5 @@
         except errors.IncompatibleFormat:
             raise tests.TestNotApplicable(
                 'Control dir does not support creating branch references.')
-        self.assertEqual(referenced.base,
-            repo.controldir.get_branch_reference('foo'))
+        self.assertEqual(referenced.user_url,
+                         repo.controldir.get_branch_reference('foo'))
 
=== modified file 'breezy/tests/per_interbranch/test_pull.py'
--- breezy/tests/per_interbranch/test_pull.py	2018-03-01 00:15:57 +0000
+++ breezy/tests/per_interbranch/test_pull.py	2018-03-04 17:01:53 +0000
@@ -21,6 +21,7 @@
 from breezy import errors
 from breezy.memorytree import MemoryTree
 from breezy.revision import NULL_REVISION
+from breezy.tests import TestNotApplicable
 from breezy.tests.per_interbranch import TestCaseWithInterBranch
 
 
@@ -77,7 +78,11 @@
         other = self.sprout_to(master_tree.branch.controldir, 'other').open_branch()
         # move the branch out of the way on disk to cause a connection
         # error.
-        master_tree.branch.controldir.destroy_branch()
+        try:
+            master_tree.branch.controldir.destroy_branch()
+        except errors.UnsupportedOperation:
+            raise TestNotApplicable(
+                'control format does not support destroying default branch')
         # try to pull, which should raise a BoundBranchConnectionFailure.
         self.assertRaises(errors.BoundBranchConnectionFailure,
                           checkout.branch.pull, other)
 
=== modified file 'breezy/tests/per_workingtree/test_smart_add.py'
--- breezy/tests/per_workingtree/test_smart_add.py	2018-02-26 13:36:15 +0000
+++ breezy/tests/per_workingtree/test_smart_add.py	2018-03-04 17:01:53 +0000
@@ -138,7 +138,7 @@
 
         self.build_tree(build_paths)
         wt = self.make_branch_and_tree('.')
-        if wt.user_url != wt.branch.user_url:
+        if wt.controldir.user_url != wt.branch.controldir.user_url:
             # Lightweight checkout, make sure we have a repo location.
             wt.branch.controldir.root_transport.mkdir('original')
         child_tree = self.make_branch_and_tree('original/child')
 
=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2018-03-02 01:33:39 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2018-03-04 17:01:53 +0000
@@ -1233,9 +1233,6 @@
         wt = self.make_branch_and_tree('wt')
         self.assertIsInstance(wt.user_url, str)
         self.assertEqual(wt.user_url, wt.user_transport.base)
-        # for all current bzrdir implementations the user dir must be 
-        # above the control dir but we might need to relax that?
-        self.assertEqual(wt.control_url.find(wt.user_url), 0)
         self.assertEqual(wt.control_url, wt.control_transport.base)