← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_tree.py

  • Committer: Aaron Bentley
  • Date: 2006-09-28 01:53:23 UTC
  • mfrom: (2049 +trunk)
  • mto: (1731.2.8 nested-trees)
  • mto: This revision was merged to the branch mainline in revision 2078.
  • Revision ID: aaron.bentley@utoronto.ca-20060928015323-4e7367532c857e87
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tree.py
65
65
        extra_trees=None, require_versioned=False, include_root=False):
66
66
        self.calls.append(
67
67
            ('compare', self.source, self.target, want_unchanged,
68
 
             specific_files, extra_trees, require_versioned, include_root)
 
68
             specific_files, extra_trees, require_versioned, 
 
69
             include_root)
69
70
            )
70
71
    
71
72
    @classmethod
89
90
            tree.changes_from(tree2)
90
91
            # pass in all optional arguments by position
91
92
            tree.changes_from(tree2, 'unchanged', 'specific', 'extra', 
92
 
                              'require', 'include_root')
 
93
                              'require', True)
93
94
            # pass in all optional arguments by keyword
94
95
            tree.changes_from(tree2,
95
96
                specific_files='specific',
96
97
                want_unchanged='unchanged',
97
98
                extra_trees='extra',
98
99
                require_versioned='require',
99
 
                include_root='include_root',
 
100
                include_root=True,
100
101
                )
101
102
        finally:
102
103
            InterTree._optimisers = old_optimisers
103
104
        self.assertEqual(
104
105
            [
105
106
             ('compare', tree2, tree, False, None, None, False, False),
106
 
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra', 
107
 
              'require', 'include_root'),
108
 
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra', 
109
 
              'require', 'include_root'),
 
107
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra',
 
108
              'require', True),
 
109
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra',
 
110
              'require', True),
110
111
            ], RecordingOptimiser.calls)
111
112
 
112
113
    def test_changes_from_with_root(self):