← 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: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tree.py
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 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
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):
 
65
        extra_trees=None, require_versioned=False, include_root=False,
 
66
        want_unversioned=False):
66
67
        self.calls.append(
67
68
            ('compare', self.source, self.target, want_unchanged,
68
69
             specific_files, extra_trees, require_versioned, 
69
 
             include_root)
 
70
             include_root, want_unversioned)
70
71
            )
71
72
    
72
73
    @classmethod
98
99
                extra_trees='extra',
99
100
                require_versioned='require',
100
101
                include_root=True,
 
102
                want_unversioned=True,
101
103
                )
102
104
        finally:
103
105
            InterTree._optimisers = old_optimisers
104
106
        self.assertEqual(
105
107
            [
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),
 
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),
111
113
            ], RecordingOptimiser.calls)
 
114
 
 
115
    def test_changes_from_with_root(self):
 
116
        """Ensure the include_root option does what's expected."""
 
117
        wt = self.make_branch_and_tree('.')
 
118
        delta = wt.changes_from(wt.basis_tree())
 
119
        self.assertEqual(len(delta.added), 0)
 
120
        delta = wt.changes_from(wt.basis_tree(), wt, include_root=True)
 
121
        self.assertEqual(len(delta.added), 1)
 
122
        self.assertEqual(delta.added[0][0], '')