/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: Canonical.com Patch Queue Manager
  • Date: 2007-12-20 16:16:34 UTC
  • mfrom: (3123.5.18 hardlinks)
  • Revision ID: pqm@pqm.ubuntu.com-20071220161634-2kcjb650o21ydko4
Accelerate build_tree using similar workingtrees (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2746
2746
        control_files.put_bytes('pending-merges', '')
2747
2747
        
2748
2748
 
2749
 
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None):
 
2749
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
 
2750
                   accelerator_tree=None):
2750
2751
        """See WorkingTreeFormat.initialize()."""
2751
2752
        if not isinstance(a_bzrdir.transport, LocalTransport):
2752
2753
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
2838
2839
        return LockableFiles(transport, self._lock_file_name, 
2839
2840
                             self._lock_class)
2840
2841
 
2841
 
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None):
 
2842
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
 
2843
                   accelerator_tree=None):
2842
2844
        """See WorkingTreeFormat.initialize().
2843
2845
        
2844
 
        revision_id allows creating a working tree at a different
2845
 
        revision than the branch is at.
 
2846
        :param revision_id: if supplied, create a working tree at a different
 
2847
            revision than the branch is at.
 
2848
        :param accelerator_tree: A tree which can be used for retrieving file
 
2849
            contents more quickly than the revision tree, i.e. a workingtree.
 
2850
            The revision tree will be used for cases where accelerator_tree's
 
2851
            content is different.
2846
2852
        """
2847
2853
        if not isinstance(a_bzrdir.transport, LocalTransport):
2848
2854
            raise errors.NotLocalUrl(a_bzrdir.transport.base)