Merge lp:~wgrant/bzr-git/tree-by-id into lp:bzr-git

[William Grant]

[Richard Wilbur (richard-wilbur)]

Thanks for fixing the known failure!
+1

review: Approve

=== modified file 'NEWS'
--- NEWS	2015-05-08 02:22:21 +0000
+++ NEWS	2015-05-10 01:02:14 +0000
@@ -7,6 +7,9 @@
 
   * Fix compatibility with and depend on dulwich 0.9.6. (William Grant)
 
+  * Correctly handle all moves when converting bzr trees to git.
+    (William Grant, #818318)
+
 0.6.12  2013-09-22
 
  FEATURES

=== modified file 'object_store.py'
--- object_store.py	2013-08-21 04:02:54 +0000
+++ object_store.py	2015-05-10 01:02:14 +0000
@@ -173,7 +173,7 @@
         in empty directories. None to skip empty directories
     :return: Yields (path, object, ie) entries
     """
-    new_trees = {}
+    dirty_dirs = set()
     new_blobs = []
     shamap = {}
     try:
@@ -219,7 +219,6 @@
                         shamap[file_id] = blob.id
             if not file_id in shamap:
                 new_blobs.append((path[1], file_id))
-            new_trees[posixpath.dirname(path[1])] = parent[1]
         elif kind[1] == "symlink":
             if changed_content:
                 target = tree.get_symlink_target(file_id)
@@ -229,14 +228,11 @@
                     find_unchanged_parent_ie(file_id, kind[1], target, other_parent_trees)
                 except KeyError:
                     yield path[1], blob, (file_id, tree.get_file_revision(file_id, path[1]))
-            new_trees[posixpath.dirname(path[1])] = parent[1]
         elif kind[1] not in (None, "directory"):
             raise AssertionError(kind[1])
-        if (path[0] not in (None, "") and
-            tree.has_id(parent[0]) and
-            tree.kind(parent[0]) == "directory"):
-            # Removal
-            new_trees[posixpath.dirname(path[0])] = parent[0]
+        for p in parent:
+            if p and tree.has_id(p) and tree.kind(p) == "directory":
+                dirty_dirs.add(p)
 
     # Fetch contents of the blobs that were changed
     for (path, file_id), chunks in tree.iter_files_bytes(
@@ -250,18 +246,24 @@
         parent_path = posixpath.dirname(path)
         file_id = tree.path2id(parent_path)
         assert file_id is not None, "Unable to find file id for %r" % parent_path
-        new_trees[parent_path] = file_id
+        dirty_dirs.add(file_id)
+
+    try:
+        inv = tree.root_inventory
+    except AttributeError:
+        inv = tree.inventory
 
     trees = {}
-    while new_trees:
-        items = new_trees.items()
-        new_trees = {}
-        for path, file_id in items:
-            if path != "":
-                parent_path = urlutils.dirname(path)
-                parent_id = tree.path2id(parent_path)
-                new_trees[parent_path] = parent_id
-            trees[path] = file_id
+    while dirty_dirs:
+        new_dirs = set()
+        for file_id in dirty_dirs:
+            if file_id is None or not inv.has_id(file_id):
+                continue
+            trees[inv.id2path(file_id)] = file_id
+            ie = inv[file_id]
+            if ie.parent_id is not None:
+                new_dirs.add(ie.parent_id)
+        dirty_dirs = new_dirs
 
     def ie_to_hexsha(ie):
         try:
@@ -287,11 +289,6 @@
             else:
                 raise AssertionError
 
-    try:
-        inv = tree.root_inventory
-    except AttributeError:
-        inv = tree.inventory
-
     for path in sorted(trees.keys(), reverse=True):
         file_id = trees[path]
         assert tree.kind(file_id) == 'directory'

=== modified file 'tests/test_push.py'
--- tests/test_push.py	2012-01-20 13:33:01 +0000
+++ tests/test_push.py	2015-05-10 01:02:14 +0000
@@ -109,8 +109,7 @@
         commit = store[gitid]
         tree = store[commit.tree]
         tree.check()
-        self.expectFailure("fails with KeyError (bug 818318)",
-            self.assertTrue, tree["baz"][1] in store)
+        self.assertTrue(tree["baz"][1] in store)
         baz = store[tree["baz"][1]]
         baz.check()
         ircdotnet = store[baz["IrcDotNet"][1]]