← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_delta.py

  • Committer: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_delta.py
19
19
 
20
20
from bzrlib import (
21
21
    delta as _mod_delta,
 
22
    inventory,
22
23
    tests,
23
24
    )
24
25
 
39
40
    def assertReport(self, expected, file_id='fid', path='path',
40
41
                     versioned_change='unchanged', renamed=False,
41
42
                     modified='unchanged', exe_change=False,
42
 
                     kind=('file', 'file'), old_path=None,
43
 
                     unversioned_filter=None):
 
43
                     kind=('file', 'file'), old_path=None):
44
44
        result = []
45
45
        def result_line(format, *args):
46
46
            result.append(format % args)
47
 
        reporter = _mod_delta._ChangeReporter(result_line,
48
 
            unversioned_filter=unversioned_filter)
49
 
        reporter.report(file_id, (old_path, path), versioned_change, renamed,
50
 
            modified, exe_change, kind)
51
 
        if expected is not None:
52
 
            self.assertEqualDiff(expected, result[0])
53
 
        else:
54
 
            self.assertEqual([], result)
 
47
        inv = inventory.Inventory()
 
48
        if old_path is not None:
 
49
            inv.add(inventory.InventoryFile(file_id, old_path,
 
50
                                            inv.root.file_id))
 
51
        reporter = _mod_delta.ChangeReporter(inv, result_line)
 
52
        reporter.report(file_id, path, versioned_change, renamed, modified,
 
53
                         exe_change, kind)
 
54
        self.assertEqualDiff(expected, result[0])
55
55
 
56
56
    def test_rename(self):
57
57
        self.assertReport('R   old => path', renamed=True, old_path='old')
58
58
        self.assertReport('    path')
59
 
        self.assertReport('RN  old => path', renamed=True, old_path='old',
60
 
                          modified='created', kind=(None, 'file'))
61
59
 
62
60
    def test_kind(self):
63
61
        self.assertReport(' K  path => path/', modified='kind changed',
64
 
                          kind=('file', 'directory'), old_path='path')
 
62
                          kind=('file', 'directory'))
65
63
        self.assertReport(' K  path/ => path', modified='kind changed',
66
64
                          kind=('directory', 'file'), old_path='old')
67
65
        self.assertReport('RK  old => path/', renamed=True,
72
70
                          kind=(None, 'directory'))
73
71
        self.assertReport('+   path/', versioned_change='added',
74
72
                          modified='unchanged', kind=(None, 'directory'))
75
 
        self.assertReport('+   path', versioned_change='added',
76
 
                          modified='unchanged', kind=(None, None))
77
73
        self.assertReport('+N  path/', versioned_change='added',
78
74
                          modified='created', kind=(None, 'directory'))
79
75
        self.assertReport('+M  path/', versioned_change='added',
80
76
                          modified='modified', kind=(None, 'directory'))
 
77
        self.assertReport('+K  path => path/', versioned_change='added',
 
78
                          modified='kind changed', kind=('file', 'directory'))
81
79
 
82
80
    def test_removal(self):
83
81
        self.assertReport(' D  path/', modified='deleted',
84
82
                          kind=('directory', None), old_path='old')
85
83
        self.assertReport('-   path/', versioned_change='removed',
86
 
                          old_path='path',
87
84
                          kind=(None, 'directory'))
88
85
        self.assertReport('-D  path', versioned_change='removed',
89
 
                          old_path='path',
90
86
                          modified='deleted', kind=('file', 'directory'))
91
87
 
92
88
    def test_modification(self):
93
89
        self.assertReport(' M  path', modified='modified')
94
90
        self.assertReport(' M* path', modified='modified', exe_change=True)
95
91
 
96
 
    def test_unversioned(self):
97
 
        # by default any unversioned file is output
98
 
        self.assertReport('?   subdir/foo~', file_id=None, path='subdir/foo~',
99
 
            old_path=None, versioned_change='unversioned',
100
 
            renamed=False, modified='created', exe_change=False,
101
 
            kind=(None, 'file'))
102
 
        # but we can choose to filter these. Probably that should be done 
103
 
        # close to the tree, but this is a reasonable starting point.
104
 
        self.assertReport(None, file_id=None, path='subdir/foo~',
105
 
            old_path=None, versioned_change='unversioned',
106
 
            renamed=False, modified='created', exe_change=False,
107
 
            kind=(None, 'file'), unversioned_filter=lambda x:True)
108
 
 
109
92
    def assertChangesEqual(self,
110
93
                           file_id='fid',
111
 
                           paths=('path', 'path'),
 
94
                           path='path',
112
95
                           content_change=False,
113
96
                           versioned=(True, True),
114
97
                           parent_id=('pid', 'pid'),
120
103
                           modified='unchanged',
121
104
                           exe_change=False):
122
105
        reporter = InstrumentedReporter()
123
 
        _mod_delta.report_changes([(file_id, paths, content_change, versioned,
 
106
        _mod_delta.report_changes([(file_id, path, content_change, versioned,
124
107
            parent_id, name, kind, executable)], reporter)
125
108
        output = reporter.calls[0]
126
109
        self.assertEqual(file_id, output[0])
127
 
        self.assertEqual(paths, output[1])
 
110
        self.assertEqual(path, output[1])
128
111
        self.assertEqual(versioned_change, output[2])
129
112
        self.assertEqual(renamed, output[3])
130
113
        self.assertEqual(modified, output[4])
157
140
        self.assertChangesEqual(exe_change=False, modified='kind changed',
158
141
                                executable=(False, True),
159
142
                                kind=('directory', 'file'))
160
 
        self.assertChangesEqual(parent_id=('pid', None))
161
143
 
162
144
        # Now make sure they all work together
163
145
        self.assertChangesEqual(versioned_change='removed',
172
154
                                content_change=True, name=('old', 'new'),
173
155
                                executable=(False, True))
174
156
 
175
 
    def test_report_unversioned(self):
176
 
        """Unversioned entries are reported well."""
177
 
        self.assertChangesEqual(file_id=None, paths=(None, 'full/path'),
178
 
                           content_change=True,
179
 
                           versioned=(False, False),
180
 
                           parent_id=(None, None),
181
 
                           name=(None, 'path'),
182
 
                           kind=(None, 'file'),
183
 
                           executable=(None, False),
184
 
                           versioned_change='unversioned',
185
 
                           renamed=False,
186
 
                           modified='created',
187
 
                           exe_change=False)
188
 
 
189
157
 
190
158
class TestChangesFrom (tests.TestCaseWithTransport):
191
159
 
224
192
        self.assertEqual(other_delta, delta)
225
193
        self.assertEqualDiff("TreeDelta(added=[], removed=[], renamed=[],"
226
194
            " kind_changed=[(u'filename', 'file-id', 'file', 'directory')],"
227
 
            " modified=[], unchanged=[], unversioned=[])", repr(delta))
 
195
            " modified=[], unchanged=[])", repr(delta))
228
196
        self.assertEqual('K  filename (file => directory) file-id\n',
229
197
                         self.show_string(delta, show_ids=True,
230
198
                         short_status=True))