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

  • Committer: Jelmer Vernooij
  • Date: 2018-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_delta.py
21
21
    revision as _mod_revision,
22
22
    tests,
23
23
    )
24
 
from ..tree import TreeChange
25
24
from ..sixish import (
26
 
    PY3,
27
25
    StringIO,
28
26
    )
29
27
 
32
30
    def __init__(self):
33
31
        self.calls = []
34
32
 
35
 
    def report(self, path, versioned, renamed, copied, modified, exe_change,
 
33
    def report(self, file_id, path, versioned, renamed, modified, exe_change,
36
34
               kind):
37
 
        self.calls.append(
38
 
            (path, versioned, renamed, copied, modified, exe_change, kind))
 
35
        self.calls.append((file_id, path, versioned, renamed, modified,
 
36
                           exe_change, kind))
39
37
 
40
38
 
41
39
class TestReportChanges(tests.TestCase):
42
40
    """Test the new change reporting infrastructure"""
43
41
 
44
 
    def assertReport(self, expected, file_id=b'fid', path='path',
 
42
    def assertReport(self, expected, file_id='fid', path='path',
45
43
                     versioned_change='unchanged', renamed=False,
46
 
                     copied=False, modified='unchanged', exe_change=False,
 
44
                     modified='unchanged', exe_change=False,
47
45
                     kind=('file', 'file'), old_path=None,
48
46
                     unversioned_filter=None, view_info=None):
49
47
        if expected is None:
51
49
        else:
52
50
            expected_lines = [expected]
53
51
        self.assertReportLines(expected_lines, file_id, path,
54
 
                               versioned_change, renamed,
55
 
                               copied, modified, exe_change,
56
 
                               kind, old_path,
57
 
                               unversioned_filter, view_info)
 
52
                     versioned_change, renamed,
 
53
                     modified, exe_change,
 
54
                     kind, old_path,
 
55
                     unversioned_filter, view_info)
58
56
 
59
 
    def assertReportLines(self, expected_lines, file_id=b'fid', path='path',
60
 
                          versioned_change='unchanged', renamed=False, copied=False,
61
 
                          modified='unchanged', exe_change=False,
62
 
                          kind=('file', 'file'), old_path=None,
63
 
                          unversioned_filter=None, view_info=None):
 
57
    def assertReportLines(self, expected_lines, file_id='fid', path='path',
 
58
                     versioned_change='unchanged', renamed=False,
 
59
                     modified='unchanged', exe_change=False,
 
60
                     kind=('file', 'file'), old_path=None,
 
61
                     unversioned_filter=None, view_info=None):
64
62
        result = []
65
 
 
66
63
        def result_line(format, *args):
67
64
            result.append(format % args)
68
 
        reporter = _mod_delta._ChangeReporter(
69
 
            result_line, unversioned_filter=unversioned_filter,
70
 
            view_info=view_info)
71
 
        reporter.report((old_path, path), versioned_change, renamed, copied,
72
 
                        modified, exe_change, kind)
 
65
        reporter = _mod_delta._ChangeReporter(result_line,
 
66
            unversioned_filter=unversioned_filter, view_info=view_info)
 
67
        reporter.report(file_id, (old_path, path), versioned_change, renamed,
 
68
            modified, exe_change, kind)
73
69
        if expected_lines is not None:
74
70
            self.assertEqualDiff('\n'.join(expected_lines), '\n'.join(result))
75
71
        else:
89
85
        self.assertReport('RK  old => path/', renamed=True,
90
86
                          modified='kind changed',
91
87
                          kind=('file', 'directory'), old_path='old')
92
 
 
93
88
    def test_new(self):
94
89
        self.assertReport(' N  path/', modified='created',
95
90
                          kind=(None, 'directory'))
119
114
    def test_unversioned(self):
120
115
        # by default any unversioned file is output
121
116
        self.assertReport('?   subdir/foo~', file_id=None, path='subdir/foo~',
122
 
                          old_path=None, versioned_change='unversioned',
123
 
                          renamed=False, modified='created', exe_change=False,
124
 
                          kind=(None, 'file'))
 
117
            old_path=None, versioned_change='unversioned',
 
118
            renamed=False, modified='created', exe_change=False,
 
119
            kind=(None, 'file'))
125
120
        # but we can choose to filter these. Probably that should be done
126
121
        # close to the tree, but this is a reasonable starting point.
127
122
        self.assertReport(None, file_id=None, path='subdir/foo~',
128
 
                          old_path=None, versioned_change='unversioned',
129
 
                          renamed=False, modified='created', exe_change=False,
130
 
                          kind=(None, 'file'), unversioned_filter=lambda x: True)
 
123
            old_path=None, versioned_change='unversioned',
 
124
            renamed=False, modified='created', exe_change=False,
 
125
            kind=(None, 'file'), unversioned_filter=lambda x:True)
131
126
 
132
127
    def test_missing(self):
133
128
        self.assertReport('+!  missing.c', file_id=None, path='missing.c',
134
 
                          old_path=None, versioned_change='added',
135
 
                          renamed=False, modified='missing', exe_change=False,
136
 
                          kind=(None, None))
 
129
             old_path=None, versioned_change='added',
 
130
             renamed=False, modified='missing', exe_change=False,
 
131
             kind=(None, None))
137
132
 
138
133
    def test_view_filtering(self):
139
134
        # If a file in within the view, it should appear in the output
141
136
            "Operating on whole tree but only reporting on 'my' view.",
142
137
            " M  path"]
143
138
        self.assertReportLines(expected_lines, modified='modified',
144
 
                               view_info=('my', ['path']))
 
139
            view_info=('my', ['path']))
145
140
        # If a file in outside the view, it should not appear in the output
146
141
        expected_lines = [
147
142
            "Operating on whole tree but only reporting on 'my' view."]
148
143
        self.assertReportLines(expected_lines, modified='modified',
149
 
                               path="foo", view_info=('my', ['path']))
 
144
            path="foo", view_info=('my', ['path']))
150
145
 
151
146
    def assertChangesEqual(self,
152
 
                           file_id=b'fid',
 
147
                           file_id='fid',
153
148
                           paths=('path', 'path'),
154
149
                           content_change=False,
155
150
                           versioned=(True, True),
159
154
                           executable=(False, False),
160
155
                           versioned_change='unchanged',
161
156
                           renamed=False,
162
 
                           copied=False,
163
157
                           modified='unchanged',
164
158
                           exe_change=False):
165
159
        reporter = InstrumentedReporter()
166
 
        _mod_delta.report_changes([
167
 
            TreeChange(
168
 
                file_id, paths, content_change, versioned, parent_id,
169
 
                name, kind, executable, copied)], reporter)
 
160
        _mod_delta.report_changes([(file_id, paths, content_change, versioned,
 
161
            parent_id, name, kind, executable)], reporter)
170
162
        output = reporter.calls[0]
171
 
        self.assertEqual(paths, output[0])
172
 
        self.assertEqual(versioned_change, output[1])
173
 
        self.assertEqual(renamed, output[2])
174
 
        self.assertEqual(copied, output[3])
 
163
        self.assertEqual(file_id, output[0])
 
164
        self.assertEqual(paths, output[1])
 
165
        self.assertEqual(versioned_change, output[2])
 
166
        self.assertEqual(renamed, output[3])
175
167
        self.assertEqual(modified, output[4])
176
168
        self.assertEqual(exe_change, output[5])
177
169
        self.assertEqual(kind, output[6])
178
170
 
179
171
    def test_report_changes(self):
180
172
        """Test change detection of report_changes"""
181
 
        # Ensure no changes are detected by default
 
173
        #Ensure no changes are detected by default
182
174
        self.assertChangesEqual(modified='unchanged', renamed=False,
183
175
                                versioned_change='unchanged',
184
176
                                exe_change=False)
220
212
    def test_report_unversioned(self):
221
213
        """Unversioned entries are reported well."""
222
214
        self.assertChangesEqual(file_id=None, paths=(None, 'full/path'),
223
 
                                content_change=True,
224
 
                                versioned=(False, False),
225
 
                                parent_id=(None, None),
226
 
                                name=(None, 'path'),
227
 
                                kind=(None, 'file'),
228
 
                                executable=(None, False),
229
 
                                versioned_change='unversioned',
230
 
                                renamed=False,
231
 
                                modified='created',
232
 
                                exe_change=False)
 
215
                           content_change=True,
 
216
                           versioned=(False, False),
 
217
                           parent_id=(None, None),
 
218
                           name=(None, 'path'),
 
219
                           kind=(None, 'file'),
 
220
                           executable=(None, False),
 
221
                           versioned_change='unversioned',
 
222
                           renamed=False,
 
223
                           modified='created',
 
224
                           exe_change=False)
233
225
 
234
226
 
235
227
class TestChangesFrom(tests.TestCaseWithTransport):
236
228
 
237
 
    def show_string(self, delta, *args, **kwargs):
 
229
    def show_string(self, delta, *args,  **kwargs):
238
230
        to_file = StringIO()
239
231
        _mod_delta.report_delta(to_file, delta, *args, **kwargs)
240
232
        return to_file.getvalue()
248
240
        os.unlink('filename')
249
241
        self.build_tree(['filename/'])
250
242
        delta = tree.changes_from(tree.basis_tree())
251
 
        self.assertEqual([('filename', 'file', 'directory')],
252
 
                         [(c.path[1], c.kind[0], c.kind[1]) for c in delta.kind_changed])
 
243
        self.assertEqual([('filename', b'file-id', 'file', 'directory')],
 
244
                         delta.kind_changed)
253
245
        self.assertEqual([], delta.added)
254
246
        self.assertEqual([], delta.removed)
255
247
        self.assertEqual([], delta.renamed)
256
248
        self.assertEqual([], delta.modified)
257
249
        self.assertEqual([], delta.unchanged)
258
250
        self.assertTrue(delta.has_changed())
 
251
        self.assertTrue(delta.touches_file_id(b'file-id'))
259
252
        self.assertEqual('kind changed:\n  filename (file => directory)\n',
260
253
                         self.show_string(delta))
261
254
        other_delta = _mod_delta.TreeDelta()
262
255
        self.assertNotEqual(other_delta, delta)
263
 
        other_delta.kind_changed = [
264
 
            TreeChange(
265
 
                b'file-id',
266
 
                ('filename', 'filename'), True, (True, True),
267
 
                (tree.path2id(''), tree.path2id('')),
268
 
                ('filename', 'filename'),
269
 
                ('file', 'symlink'), (False, False))]
 
256
        other_delta.kind_changed = [('filename', b'file-id', 'file',
 
257
                                     'symlink')]
270
258
        self.assertNotEqual(other_delta, delta)
271
 
        other_delta.kind_changed = [
272
 
            TreeChange(
273
 
                b'file-id',
274
 
                ('filename', 'filename'), True, (True, True),
275
 
                (tree.path2id(''), tree.path2id('')), ('filename', 'filename'),
276
 
                ('file', 'directory'), (False, False))]
 
259
        other_delta.kind_changed = [('filename', b'file-id', 'file',
 
260
                                     'directory')]
277
261
        self.assertEqual(other_delta, delta)
 
262
        self.assertEqualDiff("TreeDelta(added=[], removed=[], renamed=[],"
 
263
            " kind_changed=[(u'filename', 'file-id', 'file', 'directory')],"
 
264
            " modified=[], unchanged=[], unversioned=[])", repr(delta))
278
265
        self.assertEqual('K  filename (file => directory) file-id\n',
279
266
                         self.show_string(delta, show_ids=True,
280
 
                                          short_status=True))
 
267
                         short_status=True))
281
268
 
282
269
        tree.rename_one('filename', 'dirname')
283
270
        delta = tree.changes_from(tree.basis_tree())
284
271
        self.assertEqual([], delta.kind_changed)
285
272
        # This loses the fact that kind changed, remembering it as a
286
273
        # modification
287
 
        self.assertEqual([TreeChange(
288
 
            b'file-id', ('filename', 'dirname'), True,
289
 
            (True, True), (tree.path2id(''), tree.path2id('')),
290
 
            ('filename', 'dirname'), ('file', 'directory'), (False, False))],
291
 
            delta.renamed)
 
274
        self.assertEqual([('filename', 'dirname', b'file-id', 'directory',
 
275
                           True, False)], delta.renamed)
292
276
        self.assertTrue(delta.has_changed())
 
277
        self.assertTrue(delta.touches_file_id(b'file-id'))
293
278
 
294
279
 
295
280
class TestDeltaShow(tests.TestCaseWithTransport):
304
289
                                  ('branch/f4', b'4\n'),
305
290
                                  ('branch/f5', b'5\n'),
306
291
                                  ('branch/dir/',),
307
 
                                  ])
 
292
                                 ])
308
293
        wt.add(['f1', 'f2', 'f3', 'f4', 'dir'],
309
294
               [b'f1-id', b'f2-id', b'f3-id', b'f4-id', b'dir-id'])
310
295
        wt.commit('commit one', rev_id=b'1')
349
334
    def test_predicate_always(self):
350
335
        d, long_status, short_status = self._get_delta()
351
336
        out = StringIO()
352
 
 
353
 
        def always(path):
 
337
        def always(path, file_id):
354
338
            return True
355
339
        _mod_delta.report_delta(out, d, short_status=True, predicate=always)
356
340
        self.assertEqual(short_status, out.getvalue())
358
342
    def test_short_status_path_predicate(self):
359
343
        d, long_status, short_status = self._get_delta()
360
344
        out = StringIO()
361
 
 
362
 
        def only_f2(path):
 
345
        def only_f2(path, file_id):
363
346
            return path == 'f2'
364
347
        _mod_delta.report_delta(out, d, short_status=True, predicate=only_f2)
365
348
        self.assertEqual("A  f2\n", out.getvalue())
367
350
    def test_long_status_path_predicate(self):
368
351
        d, long_status, short_status = self._get_delta()
369
352
        out = StringIO()
370
 
 
371
 
        def only_f2(path):
 
353
        def only_f2(path, file_id):
372
354
            return path == 'f2'
373
355
        _mod_delta.report_delta(out, d, short_status=False, predicate=only_f2)
374
356
        self.assertEqual("added:\n  f2\n", out.getvalue())
 
357
 
 
358
    def test_long_status_id_predicate(self):
 
359
        d, long_status, short_status = self._get_delta()
 
360
        out = StringIO()
 
361
        def only_f2_id(path, file_id):
 
362
            return file_id == 'f2-id'
 
363
        _mod_delta.report_delta(out, d, predicate=only_f2_id)
 
364
        self.assertEqual("added:\n  f2\n", out.getvalue())
 
365