← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-01-14 01:40:02 UTC
  • mfrom: (3177.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080114014002-pz5tya37urp1n3fk
Fix typos of Firefox and OpenOffice.org in docs (Matt Nordhoff)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
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
 
 
396
392
    def __repr__(self):
397
393
        return "<%s of %s>" % (self.__class__.__name__,
398
394
                               getattr(self, 'basedir', None))
508
504
        basis = self.basis_tree()
509
505
        basis.lock_read()
510
506
        try:
511
 
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
507
            changes = self._iter_changes(basis, True, [self.id2path(file_id)],
512
508
                require_versioned=True).next()
513
509
            changed_content, kind = changes[2], changes[6]
514
510
            if not changed_content:
1702
1698
    def kind(self, file_id):
1703
1699
        return file_kind(self.id2abspath(file_id))
1704
1700
 
1705
 
    def stored_kind(self, file_id):
1706
 
        """See Tree.stored_kind"""
1707
 
        return self.inventory[file_id].kind
1708
 
 
1709
1701
    def _comparison_data(self, entry, path):
1710
1702
        abspath = self.abspath(path)
1711
1703
        try:
1935
1927
            has_changed_files = len(unknown_nested_files) > 0
1936
1928
            if not has_changed_files:
1937
1929
                for (file_id, path, content_change, versioned, parent_id, name,
1938
 
                     kind, executable) in self.iter_changes(self.basis_tree(),
 
1930
                     kind, executable) in self._iter_changes(self.basis_tree(),
1939
1931
                         include_unchanged=True, require_versioned=False,
1940
1932
                         want_unversioned=True, specific_files=files):
1941
1933
                    if versioned == (False, False):
2698
2690
        except errors.NoSuchFile:
2699
2691
            raise errors.NoWorkingTree(base=transport.base)
2700
2692
        except KeyError:
2701
 
            raise errors.UnknownFormatError(format=format_string,
2702
 
                                            kind="working tree")
 
2693
            raise errors.UnknownFormatError(format=format_string)
2703
2694
 
2704
2695
    def __eq__(self, other):
2705
2696
        return self.__class__ is other.__class__
2772
2763
        
2773
2764
 
2774
2765
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2775
 
                   accelerator_tree=None, hardlink=False):
 
2766
                   accelerator_tree=None):
2776
2767
        """See WorkingTreeFormat.initialize()."""
2777
2768
        if not isinstance(a_bzrdir.transport, LocalTransport):
2778
2769
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
2865
2856
                             self._lock_class)
2866
2857
 
2867
2858
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2868
 
                   accelerator_tree=None, hardlink=False):
 
2859
                   accelerator_tree=None):
2869
2860
        """See WorkingTreeFormat.initialize().
2870
2861
        
2871
2862
        :param revision_id: if supplied, create a working tree at a different
2874
2865
            contents more quickly than the revision tree, i.e. a workingtree.
2875
2866
            The revision tree will be used for cases where accelerator_tree's
2876
2867
            content is different.
2877
 
        :param hardlink: If true, hard-link files from accelerator_tree,
2878
 
            where possible.
2879
2868
        """
2880
2869
        if not isinstance(a_bzrdir.transport, LocalTransport):
2881
2870
            raise errors.NotLocalUrl(a_bzrdir.transport.base)