Merge lp:~jelmer/brz/transform-canonical-path into lp:brz/3.1

[Jelmer Vernooij]

Use Tree.get_canonical_path in TreeTransform.

Use Tree.get_canonical_path in TreeTransform.

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

Voting criteria not met
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/799/

[Jelmer Vernooij (jelmer)]

review: Approve

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

Merging failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/802/

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/803/

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/804/

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/869/

=== modified file 'breezy/bzr/transform.py'
--- breezy/bzr/transform.py	2020-09-02 17:00:38 +0000
+++ breezy/bzr/transform.py	2021-02-19 22:55:45 +0000
@@ -1448,22 +1448,7 @@
 
     def canonical_path(self, path):
         """Get the canonical tree-relative path"""
-        # don't follow final symlinks
-        abs = self._tree.abspath(path)
-        if abs in self._relpaths:
-            return self._relpaths[abs]
-        dirname, basename = os.path.split(abs)
-        if dirname not in self._realpaths:
-            self._realpaths[dirname] = os.path.realpath(dirname)
-        dirname = self._realpaths[dirname]
-        abs = osutils.pathjoin(dirname, basename)
-        if dirname in self._relpaths:
-            relpath = osutils.pathjoin(self._relpaths[dirname], basename)
-            relpath = relpath.rstrip('/\\')
-        else:
-            relpath = self._tree.relpath(abs)
-        self._relpaths[abs] = relpath
-        return relpath
+        return self._tree.get_canonical_path(path)
 
     def tree_kind(self, trans_id):
         """Determine the file kind in the working tree.

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2020-09-02 15:11:17 +0000
+++ breezy/bzr/workingtree.py	2021-02-19 22:55:45 +0000
@@ -1802,7 +1802,7 @@
                 normalize = None
             for path in paths:
                 if normalize is None or self.is_versioned(path):
-                    yield path
+                    yield path.strip('/')
                 else:
                     yield get_canonical_path(self, path, normalize)
 

=== modified file 'breezy/tests/per_workingtree/test_canonical_path.py'
--- breezy/tests/per_workingtree/test_canonical_path.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_workingtree/test_canonical_path.py	2021-02-19 22:55:45 +0000
@@ -70,7 +70,7 @@
     def test_canonical_path_root(self):
         work_tree = self._make_canonical_test_tree()
         self.assertEqual('', work_tree.get_canonical_path(''))
-        self.assertEqual('/', work_tree.get_canonical_path('/'))
+        self.assertEqual('', work_tree.get_canonical_path('/'))
 
     def test_canonical_path_invalid_all(self):
         work_tree = self._make_canonical_test_tree()

=== modified file 'breezy/tests/test_tree.py'
--- breezy/tests/test_tree.py	2020-07-05 00:45:13 +0000
+++ breezy/tests/test_tree.py	2021-02-19 22:55:45 +0000
@@ -239,3 +239,14 @@
         self.assertEqual(
             'a/C',
             get_canonical_path(tree, 'A/C', lambda x: x.lower()))
+
+    def test_trailing_slash(self):
+        tree = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/a/', 'tree/a/b'])
+        tree.add(['a', 'a/b'])
+        self.assertEqual(
+            'a',
+            get_canonical_path(tree, 'a', lambda x: x))
+        self.assertEqual(
+            'a',
+            get_canonical_path(tree, 'a/', lambda x: x))

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2020-08-22 15:44:15 +0000
+++ breezy/tree.py	2021-02-19 22:55:45 +0000
@@ -959,6 +959,8 @@
     cur_path = ''
     bit_iter = iter(path.split("/"))
     for elt in bit_iter:
+        if not elt:
+            continue
         lelt = normalize(elt)
         new_path = None
         try: