/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.py

  • Committer: John Arbash Meinel
  • Date: 2008-03-05 17:35:14 UTC
  • mfrom: (3250 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3280.
  • Revision ID: john@arbash-meinel.com-20080305173514-933wremo23r9doex
[merge] bzr.dev 3250

Show diffs side-by-side

added added

removed removed

Lines of Context:
389
389
            if osutils.lexists(self.abspath(path)):
390
390
                yield ie.file_id
391
391
 
 
392
    def all_file_ids(self):
 
393
        """See Tree.iter_all_file_ids"""
 
394
        return set(self.inventory)
 
395
 
392
396
    def __repr__(self):
393
397
        return "<%s of %s>" % (self.__class__.__name__,
394
398
                               getattr(self, 'basedir', None))
1698
1702
    def kind(self, file_id):
1699
1703
        return file_kind(self.id2abspath(file_id))
1700
1704
 
 
1705
    def stored_kind(self, file_id):
 
1706
        """See Tree.stored_kind"""
 
1707
        return self.inventory[file_id].kind
 
1708
 
1701
1709
    def _comparison_data(self, entry, path):
1702
1710
        abspath = self.abspath(path)
1703
1711
        try:
2763
2771
        
2764
2772
 
2765
2773
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2766
 
                   accelerator_tree=None):
 
2774
                   accelerator_tree=None, hardlink=False):
2767
2775
        """See WorkingTreeFormat.initialize()."""
2768
2776
        if not isinstance(a_bzrdir.transport, LocalTransport):
2769
2777
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
2856
2864
                             self._lock_class)
2857
2865
 
2858
2866
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2859
 
                   accelerator_tree=None):
 
2867
                   accelerator_tree=None, hardlink=False):
2860
2868
        """See WorkingTreeFormat.initialize().
2861
2869
        
2862
2870
        :param revision_id: if supplied, create a working tree at a different
2865
2873
            contents more quickly than the revision tree, i.e. a workingtree.
2866
2874
            The revision tree will be used for cases where accelerator_tree's
2867
2875
            content is different.
 
2876
        :param hardlink: If true, hard-link files from accelerator_tree,
 
2877
            where possible.
2868
2878
        """
2869
2879
        if not isinstance(a_bzrdir.transport, LocalTransport):
2870
2880
            raise errors.NotLocalUrl(a_bzrdir.transport.base)