~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_tree.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-24 14:12:53 UTC
  • mto: This revision was merged to the branch mainline in revision 2095.
  • Revision ID: john@arbash-meinel.com-20061024141253-783fba812b197b70
(John Arbash Meinel) Update version information for 0.13 development

Show diffs side-by-side

added added

removed removed

Lines of Context:
62
62
    calls = []
63
63
 
64
64
    def compare(self, want_unchanged=False, specific_files=None,
65
 
        extra_trees=None, require_versioned=False, include_root=False,
66
 
        want_unversioned=False):
 
65
        extra_trees=None, require_versioned=False, include_root=False):
67
66
        self.calls.append(
68
67
            ('compare', self.source, self.target, want_unchanged,
69
68
             specific_files, extra_trees, require_versioned, 
70
 
             include_root, want_unversioned)
 
69
             include_root)
71
70
            )
72
71
    
73
72
    @classmethod
99
98
                extra_trees='extra',
100
99
                require_versioned='require',
101
100
                include_root=True,
102
 
                want_unversioned=True,
103
101
                )
104
102
        finally:
105
103
            InterTree._optimisers = old_optimisers
106
104
        self.assertEqual(
107
105
            [
108
 
             ('compare', tree2, tree, False, None, None, False, False, False),
109
 
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra',
110
 
              'require', True, False),
111
 
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra',
112
 
              'require', True, True),
 
106
             ('compare', tree2, tree, False, None, None, False, False),
 
107
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra',
 
108
              'require', True),
 
109
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra',
 
110
              'require', True),
113
111
            ], RecordingOptimiser.calls)
114
112
 
115
113
    def test_changes_from_with_root(self):