/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/tests/test_mutabletree.py

  • Committer: Lawrence Mitchell
  • Date: 2011-11-08 10:54:09 UTC
  • mto: This revision was merged to the branch mainline in revision 6245.
  • Revision ID: wence@gmx.li-20111108105409-cgdqeek7vl7e8nbb
Only set check_clean if {clean} is asked for in template
      
The {clean} flag in templates requires an lstat of every file in the
repository.  If the filesystem is slow this can take a noticeable
amount of time.  So only switch check_clean to True if the template
actually asks for it, to avoid penalising those who don't want to
know.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_mutabletree.py
55
55
        self.assertTrue(self.tree.has_changes())
56
56
 
57
57
    def test_with_pending_merges(self):
 
58
        self.tree.commit('first commit')
58
59
        other_tree = self.tree.bzrdir.sprout('other').open_workingtree()
59
 
        self.build_tree(['other/file'])
60
 
        other_tree.add('file')
61
 
        other_tree.commit('added file')
 
60
        other_tree.commit('mergeable commit')
62
61
        self.tree.merge_from_branch(other_tree.branch)
63
62
        self.assertTrue(self.tree.has_changes())