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

  • Committer: Robert Collins
  • Date: 2008-09-02 00:01:34 UTC
  • mfrom: (3671 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3724.
  • Revision ID: robertc@robertcollins.net-20080902000134-qz8r6v1mltygeg6t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
557
557
    def _get_rules_searcher(self, default_searcher):
558
558
        """Get the RulesSearcher for this tree given the default one."""
559
559
        searcher = default_searcher
560
 
        file_id = self.path2id(rules.RULES_TREE_FILENAME)
561
 
        if file_id is not None:
562
 
            ini_file = self.get_file(file_id)
563
 
            searcher = rules._StackedRulesSearcher(
564
 
                [rules._IniBasedRulesSearcher(ini_file), default_searcher])
565
560
        return searcher
566
561
 
567
562
 
953
948
                self.source._comparison_data(from_entry, path)
954
949
            kind = (from_kind, None)
955
950
            executable = (from_executable, None)
956
 
            changed_content = True
 
951
            changed_content = from_kind is not None
957
952
            # the parent's path is necessarily known at this point.
958
953
            yield(file_id, (path, to_path), changed_content, versioned, parent,
959
954
                  name, kind, executable)