Merge lp:~jelmer/bzr-builddeb/no-tree-inventory into lp:bzr-builddeb

[Jelmer Vernooij]

Fix support for bzr.dev, where Tree.inventory is deprecated.

[lp:~jelmer/bzr-builddeb/no-tree-inventory]

716. By Jelmer Vernooij on 2012-02-17

Add bug #

[Vincent Ladeuil (vila)]

Faster than light...

review: Approve

=== modified file 'bzrtools_import.py'
--- bzrtools_import.py	2011-10-24 16:35:29 +0000
+++ bzrtools_import.py	2012-02-17 15:22:18 +0000
@@ -227,7 +227,7 @@
     tt = TreeTransform(tree)
     try:
         removed = set()
-        for path, entry in tree.inventory.iter_entries():
+        for path, entry in tree.iter_entries_by_dir():
             if entry.parent_id is None:
                 continue
             trans_id = tt.trans_id_tree_path(path)

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-01 12:21:15 +0000
+++ debian/changelog	2012-02-17 15:22:18 +0000
@@ -3,8 +3,9 @@
   * Fix patch unapplying from DirStateRevisionTrees. LP: #923688
   * Bump distro-info dependency back to a recommends, to ease
     backporting.
+  * Cope with the deprecation of Tree.inventory in bzr/2.6. LP: #934247
 
- -- Jelmer Vernooij <[e-mail]>  Wed, 01 Feb 2012 13:20:49 +0100
+ -- Jelmer Vernooij <[e-mail]>  Fri, 17 Feb 2012 15:38:41 +0100
 
 bzr-builddeb (2.8.2) unstable; urgency=low
 

=== modified file 'tests/blackbox/test_merge_upstream.py'
--- tests/blackbox/test_merge_upstream.py	2011-11-10 15:56:26 +0000
+++ tests/blackbox/test_merge_upstream.py	2012-02-17 15:22:18 +0000
@@ -35,6 +35,13 @@
     )
 
 
+def iter_child_entries(tree, file_id):
+    try:
+        return tree.root_inventory.root.children.values()
+    except AttributeError:
+        return tree.inventory.root.children.values()
+
+
 class Fixture(object):
     """A test fixture."""
 
@@ -121,7 +128,7 @@
         tree.lock_write()
         try:
             newpath = test_case.getUniqueString()
-            for child in tree.inventory.root.children.values():
+            for child in iter_child_entries(tree, tree.get_root_id()):
                 if child.kind == 'file':
                     oldpath = child.name
             tree.rename_one(oldpath, newpath)

=== modified file 'upstream/pristinetar.py'
--- upstream/pristinetar.py	2012-01-19 11:30:35 +0000
+++ upstream/pristinetar.py	2012-02-17 15:22:18 +0000
@@ -404,7 +404,7 @@
             dest = os.path.join(tmpdir, "orig")
             tree.lock_read()
             try:
-                for (dp, ie) in tree.inventory.iter_entries():
+                for (dp, ie) in tree.iter_entries_by_dir():
                     ie._read_tree_state(dp, tree)
                 export(tree, dest, format='dir', subdir=subdir)
             finally: