← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Andrew Bennetts
  • Date: 2010-03-11 04:33:41 UTC
  • mfrom: (4797.33.4 2.1)
  • mto: This revision was merged to the branch mainline in revision 5082.
  • Revision ID: andrew.bennetts@canonical.com-20100311043341-rzdik83fnactjsxs
Merge lp:bzr/2.1, including fixes for #496813, #526211, #526353.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1372
1372
 
1373
1373
 
1374
1374
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1375
 
 
1376
1375
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1377
1376
                   accelerator_tree=None, hardlink=False):
1378
1377
        """See WorkingTreeFormat.initialize().
1833
1832
        entry = self._get_entry(file_id=file_id)[1]
1834
1833
        if entry is None:
1835
1834
            raise errors.NoSuchId(tree=self, file_id=file_id)
1836
 
        parent_index = self._get_parent_index()
1837
 
        return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
 
1835
        return dirstate.DirState._minikind_to_kind[entry[1][0]]
1838
1836
 
1839
1837
    def stored_kind(self, file_id):
1840
1838
        """See Tree.stored_kind"""