← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

https://launchpad.net/bugs/524184
NEWS section template into a separate file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
36
36
from bzrlib.inventory import InventoryFile
37
37
from bzrlib.inter import InterObject
38
38
from bzrlib.osutils import fingerprint_file
 
39
import bzrlib.revision
39
40
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
40
41
from bzrlib.trace import note
41
42
 
97
98
    def iter_changes(self, from_tree, include_unchanged=False,
98
99
                     specific_files=None, pb=None, extra_trees=None,
99
100
                     require_versioned=True, want_unversioned=False):
100
 
        """See InterTree.iter_changes"""
101
101
        intertree = InterTree.get(from_tree, self)
102
102
        return intertree.iter_changes(include_unchanged, specific_files, pb,
103
103
            extra_trees, require_versioned, want_unversioned=want_unversioned)
715
715
                for path in path_names:
716
716
                    yield searcher.get_items(path)
717
717
 
 
718
    @needs_read_lock
718
719
    def _get_rules_searcher(self, default_searcher):
719
720
        """Get the RulesSearcher for this tree given the default one."""
720
721
        searcher = default_searcher
869
870
    will pass through to InterTree as appropriate.
870
871
    """
871
872
 
872
 
    # Formats that will be used to test this InterTree. If both are
873
 
    # None, this InterTree will not be tested (e.g. because a complex
874
 
    # setup is required)
875
 
    _matching_from_tree_format = None
876
 
    _matching_to_tree_format = None
877
 
 
878
873
    _optimisers = []
879
874
 
880
875
    def _changes_from_entries(self, source_entry, target_entry,
977
972
            a PathsNotVersionedError will be thrown.
978
973
        :param want_unversioned: Scan for unversioned paths.
979
974
        """
 
975
        # NB: show_status depends on being able to pass in non-versioned files
 
976
        # and report them as unknown
980
977
        trees = (self.source,)
981
978
        if extra_trees is not None:
982
979
            trees = trees + tuple(extra_trees)