← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Andrew Bennetts
  • Date: 2009-12-03 05:57:41 UTC
  • mfrom: (4857 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4869.
  • Revision ID: andrew.bennetts@canonical.com-20091203055741-vmmg0fmjgjw2pwvu
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
851
851
    will pass through to InterTree as appropriate.
852
852
    """
853
853
 
 
854
    # Formats that will be used to test this InterTree. If both are
 
855
    # None, this InterTree will not be tested (e.g. because a complex
 
856
    # setup is required)
 
857
    _matching_from_tree_format = None
 
858
    _matching_to_tree_format = None
 
859
 
854
860
    _optimisers = []
855
861
 
856
862
    def _changes_from_entries(self, source_entry, target_entry,
953
959
            a PathsNotVersionedError will be thrown.
954
960
        :param want_unversioned: Scan for unversioned paths.
955
961
        """
956
 
        # NB: show_status depends on being able to pass in non-versioned files
957
 
        # and report them as unknown
958
962
        trees = (self.source,)
959
963
        if extra_trees is not None:
960
964
            trees = trees + tuple(extra_trees)