Merge lp:~jelmer/brz/get-canonical-path into lp:brz

[Jelmer Vernooij]

Fix get_canonical_path and add some basic tests for it.

Fix get_canonical_path and add some basic tests for it.

[Martin Packman (gz)]

Looks good, thanks.

review: Approve

=== modified file 'breezy/tests/test_tree.py'
--- breezy/tests/test_tree.py	2018-07-26 22:12:29 +0000
+++ breezy/tests/test_tree.py	2018-09-29 23:00:39 +0000
@@ -29,6 +29,7 @@
     FileTimestampUnavailable,
     InterTree,
     find_previous_paths,
+    get_canonical_path,
     )
 
 
@@ -461,3 +462,44 @@
 
         self.assertEqual({'c': 'b', 'b': None},
                          find_previous_paths(tree2, tree1, ['b', 'c']))
+
+
+class GetCanonicalPath(TestCaseWithTransport):
+
+    def test_existing_case(self):
+        # Test that we can find a file from a path with different case
+        tree = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/b'])
+        tree.add(['b'])
+        self.assertEqual(
+                'b',
+                get_canonical_path(tree, 'b', lambda x: x.lower()))
+        self.assertEqual(
+                'b',
+                get_canonical_path(tree, 'B', lambda x: x.lower()))
+
+    def test_nonexistant_preserves_case(self):
+        tree = self.make_branch_and_tree('tree')
+        self.assertEqual(
+                'b',
+                get_canonical_path(tree, 'b', lambda x: x.lower()))
+        self.assertEqual(
+                'B',
+                get_canonical_path(tree, 'B', lambda x: x.lower()))
+
+    def test_in_directory_with_case(self):
+        tree = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/a/', 'tree/a/b'])
+        tree.add(['a', 'a/b'])
+        self.assertEqual(
+                'a/b',
+                get_canonical_path(tree, 'a/b', lambda x: x.lower()))
+        self.assertEqual(
+                'a/b',
+                get_canonical_path(tree, 'A/B', lambda x: x.lower()))
+        self.assertEqual(
+                'a/b',
+                get_canonical_path(tree, 'A/b', lambda x: x.lower()))
+        self.assertEqual(
+                'a/C',
+                get_canonical_path(tree, 'A/C', lambda x: x.lower()))
 
=== modified file 'breezy/tree.py'
--- breezy/tree.py	2018-09-14 14:35:18 +0000
+++ breezy/tree.py	2018-09-29 23:00:39 +0000
@@ -1375,14 +1375,14 @@
     :return: The canonical path
     """
     # go walkin...
-    cur_id = self.get_root_id()
+    cur_id = tree.get_root_id()
     cur_path = ''
     bit_iter = iter(path.split("/"))
     for elt in bit_iter:
         lelt = normalize(elt)
         new_path = None
         try:
-            for child in self.iter_child_entries(cur_path, cur_id):
+            for child in tree.iter_child_entries(cur_path, cur_id):
                 try:
                     if child.name == elt:
                         # if we found an exact match, we can stop now; if