Rev 5083: DirStateRevisionTree.kind() should respect parent_index in file:///home/vila/src/bzr/bugs/533547-dsrt-kind/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/533547-dsrt-kind/

------------------------------------------------------------
revno: 5083
revision-id: v.ladeuil+lp at free.fr-20100310093125-drhtm9pdnm1fo7gf
parent: v.ladeuil+lp at free.fr-20100310092844-j5xqioq5wyptgja1
fixes bug(s): https://launchpad.net/bugs/533547
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 533547-dsrt-kind
timestamp: Wed 2010-03-10 10:31:25 +0100
message:
  DirStateRevisionTree.kind() should respect parent_index
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-03-10 06:38:27 +0000
+++ b/NEWS	2010-03-10 09:31:25 +0000
@@ -92,6 +92,10 @@
   ftp servers while trying to take a lock.
   (Martin Pool, #528722)
 
+* DirStateRevisionTree.kind() was returning wrong result when 'kind'
+  changes occured between the workingtree and one of its parents.
+  (Vincent Ladeuil, #533437)
+
 * Network transfer amounts and rates are now displayed in SI units according
   to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
   (Gordon Tyler, #514399)

=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2010-02-17 17:11:16 +0000
+++ b/bzrlib/workingtree_4.py	2010-03-10 09:31:25 +0000
@@ -1372,6 +1372,7 @@
 
 
 class DirStateWorkingTreeFormat(WorkingTreeFormat3):
+
     def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
                    accelerator_tree=None, hardlink=False):
         """See WorkingTreeFormat.initialize().
@@ -1832,7 +1833,8 @@
         entry = self._get_entry(file_id=file_id)[1]
         if entry is None:
             raise errors.NoSuchId(tree=self, file_id=file_id)
-        return dirstate.DirState._minikind_to_kind[entry[1][0]]
+        parent_index = self._get_parent_index()
+        return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
 
     def stored_kind(self, file_id):
         """See Tree.stored_kind"""