/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Neil Santos
  • Date: 2010-03-05 05:30:19 UTC
  • mto: (5080.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5081.
  • Revision ID: neil_santos@users.sourceforge.net-20100305053019-shzuqnhliw67q1nm
Renamed link() methods to hardlink(), as per mbp's suggestion

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
53
53
from bzrlib.decorators import needs_read_lock, needs_write_lock
54
54
from bzrlib.filters import filtered_input_file, internal_size_sha_file_byname
55
55
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory
 
56
import bzrlib.mutabletree
56
57
from bzrlib.mutabletree import needs_tree_write_lock
57
58
from bzrlib.osutils import (
58
59
    file_kind,
1371
1372
 
1372
1373
 
1373
1374
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1374
 
 
1375
1375
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
1376
                   accelerator_tree=None, hardlink=False):
1377
1377
        """See WorkingTreeFormat.initialize().
1832
1832
        entry = self._get_entry(file_id=file_id)[1]
1833
1833
        if entry is None:
1834
1834
            raise errors.NoSuchId(tree=self, file_id=file_id)
1835
 
        parent_index = self._get_parent_index()
1836
 
        return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
 
1835
        return dirstate.DirState._minikind_to_kind[entry[1][0]]
1837
1836
 
1838
1837
    def stored_kind(self, file_id):
1839
1838
        """See Tree.stored_kind"""