Rev 5788: Call iter_entries_by_dir correctly. in http://bazaar.launchpad.net/~jameinel/bzr/2.4-merge-faster-759091

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.4-merge-faster-759091

------------------------------------------------------------
revno: 5788
revision-id: john at arbash-meinel.com-20110415070506-0h8qhb3vmttd264t
parent: john at arbash-meinel.com-20110414173417-uxru2rlsj8mb6xu2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-merge-faster-759091
timestamp: Fri 2011-04-15 09:05:06 +0200
message:
  Call iter_entries_by_dir correctly.
-------------- next part --------------
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2011-04-14 17:29:13 +0000
+++ b/bzrlib/transform.py	2011-04-15 07:05:06 +0000
@@ -3039,7 +3039,8 @@
                         file_id = tt.final_file_id(trans_id)
                         if file_id is None:
                             file_id = tt.inactive_file_id(trans_id)
-                        entry = path_tree.iter_entries_by_dir([file_id]).next()
+                        _, entry = path_tree.iter_entries_by_dir(
+                            [file_id]).next()
                         # special-case the other tree root (move its
                         # children to current root)
                         if entry.parent_id is None: