/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: 2019-03-04 01:31:43 UTC
  • mfrom: (7058.6.5 memorytree-symlinks)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304013143-7euyjbmanwo3tpmn
More improvements, add tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_delta.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007-2010, 2016 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
 
from cStringIO import StringIO
19
18
 
20
 
from bzrlib import (
 
19
from .. import (
21
20
    delta as _mod_delta,
22
21
    revision as _mod_revision,
23
22
    tests,
24
23
    )
 
24
from ..sixish import (
 
25
    PY3,
 
26
    StringIO,
 
27
    )
25
28
 
26
29
 
27
30
class InstrumentedReporter(object):
37
40
class TestReportChanges(tests.TestCase):
38
41
    """Test the new change reporting infrastructure"""
39
42
 
40
 
    def assertReport(self, expected, file_id='fid', path='path',
 
43
    def assertReport(self, expected, file_id=b'fid', path='path',
41
44
                     versioned_change='unchanged', renamed=False,
42
45
                     modified='unchanged', exe_change=False,
43
46
                     kind=('file', 'file'), old_path=None,
47
50
        else:
48
51
            expected_lines = [expected]
49
52
        self.assertReportLines(expected_lines, file_id, path,
50
 
                     versioned_change, renamed,
51
 
                     modified, exe_change,
52
 
                     kind, old_path,
53
 
                     unversioned_filter, view_info)
 
53
                               versioned_change, renamed,
 
54
                               modified, exe_change,
 
55
                               kind, old_path,
 
56
                               unversioned_filter, view_info)
54
57
 
55
 
    def assertReportLines(self, expected_lines, file_id='fid', path='path',
56
 
                     versioned_change='unchanged', renamed=False,
57
 
                     modified='unchanged', exe_change=False,
58
 
                     kind=('file', 'file'), old_path=None,
59
 
                     unversioned_filter=None, view_info=None):
 
58
    def assertReportLines(self, expected_lines, file_id=b'fid', path='path',
 
59
                          versioned_change='unchanged', renamed=False,
 
60
                          modified='unchanged', exe_change=False,
 
61
                          kind=('file', 'file'), old_path=None,
 
62
                          unversioned_filter=None, view_info=None):
60
63
        result = []
 
64
 
61
65
        def result_line(format, *args):
62
66
            result.append(format % args)
63
67
        reporter = _mod_delta._ChangeReporter(result_line,
64
 
            unversioned_filter=unversioned_filter, view_info=view_info)
 
68
                                              unversioned_filter=unversioned_filter, view_info=view_info)
65
69
        reporter.report(file_id, (old_path, path), versioned_change, renamed,
66
 
            modified, exe_change, kind)
 
70
                        modified, exe_change, kind)
67
71
        if expected_lines is not None:
68
 
            for i in range(len(expected_lines)):
69
 
                self.assertEqualDiff(expected_lines[i], result[i])
 
72
            self.assertEqualDiff('\n'.join(expected_lines), '\n'.join(result))
70
73
        else:
71
74
            self.assertEqual([], result)
72
75
 
84
87
        self.assertReport('RK  old => path/', renamed=True,
85
88
                          modified='kind changed',
86
89
                          kind=('file', 'directory'), old_path='old')
 
90
 
87
91
    def test_new(self):
88
92
        self.assertReport(' N  path/', modified='created',
89
93
                          kind=(None, 'directory'))
113
117
    def test_unversioned(self):
114
118
        # by default any unversioned file is output
115
119
        self.assertReport('?   subdir/foo~', file_id=None, path='subdir/foo~',
116
 
            old_path=None, versioned_change='unversioned',
117
 
            renamed=False, modified='created', exe_change=False,
118
 
            kind=(None, 'file'))
 
120
                          old_path=None, versioned_change='unversioned',
 
121
                          renamed=False, modified='created', exe_change=False,
 
122
                          kind=(None, 'file'))
119
123
        # but we can choose to filter these. Probably that should be done
120
124
        # close to the tree, but this is a reasonable starting point.
121
125
        self.assertReport(None, 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'), unversioned_filter=lambda x:True)
 
126
                          old_path=None, versioned_change='unversioned',
 
127
                          renamed=False, modified='created', exe_change=False,
 
128
                          kind=(None, 'file'), unversioned_filter=lambda x: True)
 
129
 
 
130
    def test_missing(self):
 
131
        self.assertReport('+!  missing.c', file_id=None, path='missing.c',
 
132
                          old_path=None, versioned_change='added',
 
133
                          renamed=False, modified='missing', exe_change=False,
 
134
                          kind=(None, None))
125
135
 
126
136
    def test_view_filtering(self):
127
137
        # If a file in within the view, it should appear in the output
129
139
            "Operating on whole tree but only reporting on 'my' view.",
130
140
            " M  path"]
131
141
        self.assertReportLines(expected_lines, modified='modified',
132
 
            view_info=('my',['path']))
 
142
                               view_info=('my', ['path']))
133
143
        # If a file in outside the view, it should not appear in the output
134
144
        expected_lines = [
135
145
            "Operating on whole tree but only reporting on 'my' view."]
136
146
        self.assertReportLines(expected_lines, modified='modified',
137
 
            path="foo", view_info=('my',['path']))
 
147
                               path="foo", view_info=('my', ['path']))
138
148
 
139
149
    def assertChangesEqual(self,
140
 
                           file_id='fid',
 
150
                           file_id=b'fid',
141
151
                           paths=('path', 'path'),
142
152
                           content_change=False,
143
153
                           versioned=(True, True),
151
161
                           exe_change=False):
152
162
        reporter = InstrumentedReporter()
153
163
        _mod_delta.report_changes([(file_id, paths, content_change, versioned,
154
 
            parent_id, name, kind, executable)], reporter)
 
164
                                    parent_id, name, kind, executable)], reporter)
155
165
        output = reporter.calls[0]
156
166
        self.assertEqual(file_id, output[0])
157
167
        self.assertEqual(paths, output[1])
163
173
 
164
174
    def test_report_changes(self):
165
175
        """Test change detection of report_changes"""
166
 
        #Ensure no changes are detected by default
 
176
        # Ensure no changes are detected by default
167
177
        self.assertChangesEqual(modified='unchanged', renamed=False,
168
178
                                versioned_change='unchanged',
169
179
                                exe_change=False)
205
215
    def test_report_unversioned(self):
206
216
        """Unversioned entries are reported well."""
207
217
        self.assertChangesEqual(file_id=None, paths=(None, 'full/path'),
208
 
                           content_change=True,
209
 
                           versioned=(False, False),
210
 
                           parent_id=(None, None),
211
 
                           name=(None, 'path'),
212
 
                           kind=(None, 'file'),
213
 
                           executable=(None, False),
214
 
                           versioned_change='unversioned',
215
 
                           renamed=False,
216
 
                           modified='created',
217
 
                           exe_change=False)
 
218
                                content_change=True,
 
219
                                versioned=(False, False),
 
220
                                parent_id=(None, None),
 
221
                                name=(None, 'path'),
 
222
                                kind=(None, 'file'),
 
223
                                executable=(None, False),
 
224
                                versioned_change='unversioned',
 
225
                                renamed=False,
 
226
                                modified='created',
 
227
                                exe_change=False)
218
228
 
219
229
 
220
230
class TestChangesFrom(tests.TestCaseWithTransport):
221
231
 
222
 
    def show_string(self, delta, *args,  **kwargs):
 
232
    def show_string(self, delta, *args, **kwargs):
223
233
        to_file = StringIO()
224
234
        _mod_delta.report_delta(to_file, delta, *args, **kwargs)
225
235
        return to_file.getvalue()
228
238
        """Doing a status when a file has changed kind should work"""
229
239
        tree = self.make_branch_and_tree('.')
230
240
        self.build_tree(['filename'])
231
 
        tree.add('filename', 'file-id')
 
241
        tree.add('filename', b'file-id')
232
242
        tree.commit('added filename')
233
243
        os.unlink('filename')
234
244
        self.build_tree(['filename/'])
235
245
        delta = tree.changes_from(tree.basis_tree())
236
 
        self.assertEqual([('filename', 'file-id', 'file', 'directory')],
 
246
        self.assertEqual([('filename', b'file-id', 'file', 'directory')],
237
247
                         delta.kind_changed)
238
248
        self.assertEqual([], delta.added)
239
249
        self.assertEqual([], delta.removed)
241
251
        self.assertEqual([], delta.modified)
242
252
        self.assertEqual([], delta.unchanged)
243
253
        self.assertTrue(delta.has_changed())
244
 
        self.assertTrue(delta.touches_file_id('file-id'))
 
254
        self.assertTrue(delta.touches_file_id(b'file-id'))
245
255
        self.assertEqual('kind changed:\n  filename (file => directory)\n',
246
256
                         self.show_string(delta))
247
257
        other_delta = _mod_delta.TreeDelta()
248
258
        self.assertNotEqual(other_delta, delta)
249
 
        other_delta.kind_changed = [('filename', 'file-id', 'file',
 
259
        other_delta.kind_changed = [('filename', b'file-id', 'file',
250
260
                                     'symlink')]
251
261
        self.assertNotEqual(other_delta, delta)
252
 
        other_delta.kind_changed = [('filename', 'file-id', 'file',
 
262
        other_delta.kind_changed = [('filename', b'file-id', 'file',
253
263
                                     'directory')]
254
264
        self.assertEqual(other_delta, delta)
255
 
        self.assertEqualDiff("TreeDelta(added=[], removed=[], renamed=[],"
256
 
            " kind_changed=[(u'filename', 'file-id', 'file', 'directory')],"
257
 
            " modified=[], unchanged=[], unversioned=[])", repr(delta))
 
265
        if PY3:
 
266
            self.assertEqualDiff("TreeDelta(added=[], removed=[], renamed=[],"
 
267
                                 " kind_changed=[('filename', b'file-id', 'file', 'directory')],"
 
268
                                 " modified=[], unchanged=[], unversioned=[])", repr(delta))
 
269
        else:
 
270
            self.assertEqualDiff("TreeDelta(added=[], removed=[], renamed=[],"
 
271
                                 " kind_changed=[(u'filename', 'file-id', 'file', 'directory')],"
 
272
                                 " modified=[], unchanged=[], unversioned=[])", repr(delta))
 
273
 
258
274
        self.assertEqual('K  filename (file => directory) file-id\n',
259
275
                         self.show_string(delta, show_ids=True,
260
 
                         short_status=True))
 
276
                                          short_status=True))
261
277
 
262
278
        tree.rename_one('filename', 'dirname')
263
279
        delta = tree.changes_from(tree.basis_tree())
264
280
        self.assertEqual([], delta.kind_changed)
265
281
        # This loses the fact that kind changed, remembering it as a
266
282
        # modification
267
 
        self.assertEqual([('filename', 'dirname', 'file-id', 'directory',
 
283
        self.assertEqual([('filename', 'dirname', b'file-id', 'directory',
268
284
                           True, False)], delta.renamed)
269
285
        self.assertTrue(delta.has_changed())
270
 
        self.assertTrue(delta.touches_file_id('file-id'))
 
286
        self.assertTrue(delta.touches_file_id(b'file-id'))
271
287
 
272
288
 
273
289
class TestDeltaShow(tests.TestCaseWithTransport):
276
292
        # We build the delta from a real tree to avoid depending on internal
277
293
        # implementation details.
278
294
        wt = self.make_branch_and_tree('branch')
279
 
        self.build_tree_contents([('branch/f1', '1\n'),
280
 
                                  ('branch/f2', '2\n'),
281
 
                                  ('branch/f3', '3\n'),
282
 
                                  ('branch/f4', '4\n'),
 
295
        self.build_tree_contents([('branch/f1', b'1\n'),
 
296
                                  ('branch/f2', b'2\n'),
 
297
                                  ('branch/f3', b'3\n'),
 
298
                                  ('branch/f4', b'4\n'),
 
299
                                  ('branch/f5', b'5\n'),
283
300
                                  ('branch/dir/',),
284
 
                                 ])
 
301
                                  ])
285
302
        wt.add(['f1', 'f2', 'f3', 'f4', 'dir'],
286
 
               ['f1-id', 'f2-id', 'f3-id', 'f4-id', 'dir-id'])
287
 
        wt.commit('commit one', rev_id='1')
 
303
               [b'f1-id', b'f2-id', b'f3-id', b'f4-id', b'dir-id'])
 
304
        wt.commit('commit one', rev_id=b'1')
 
305
 
 
306
        # TODO add rename,removed,etc. here?
 
307
        wt.add('f5')
 
308
        os.unlink('branch/f5')
288
309
 
289
310
        long_status = """added:
290
311
  dir/
292
313
  f2
293
314
  f3
294
315
  f4
 
316
missing:
 
317
  f5
295
318
"""
296
319
        short_status = """A  dir/
297
320
A  f1
298
321
A  f2
299
322
A  f3
300
323
A  f4
 
324
!  f5
301
325
"""
302
326
 
303
327
        repo = wt.branch.repository
304
328
        d = wt.changes_from(repo.revision_tree(_mod_revision.NULL_REVISION))
305
329
        return d, long_status, short_status
306
330
 
307
 
    def test_delta_show_short_status_no_filter(self):
 
331
    def test_short_status(self):
308
332
        d, long_status, short_status = self._get_delta()
309
333
        out = StringIO()
310
334
        _mod_delta.report_delta(out, d, short_status=True)
311
 
        self.assertEquals(short_status, out.getvalue())
 
335
        self.assertEqual(short_status, out.getvalue())
312
336
 
313
 
    def test_delta_show_long_status_no_filter(self):
 
337
    def test_long_status(self):
314
338
        d, long_status, short_status = self._get_delta()
315
339
        out = StringIO()
316
340
        _mod_delta.report_delta(out, d, short_status=False)
317
 
        self.assertEquals(long_status, out.getvalue())
 
341
        self.assertEqual(long_status, out.getvalue())
318
342
 
319
 
    def test_delta_show_no_filter(self):
 
343
    def test_predicate_always(self):
320
344
        d, long_status, short_status = self._get_delta()
321
345
        out = StringIO()
322
 
        def not_a_filter(path, file_id):
 
346
 
 
347
        def always(path, file_id):
323
348
            return True
324
 
        _mod_delta.report_delta(out, d, short_status=True, filter=not_a_filter)
325
 
        self.assertEquals(short_status, out.getvalue())
326
 
 
327
 
    def test_delta_show_short_status_single_file_filter(self):
328
 
        d, long_status, short_status = self._get_delta()
329
 
        out = StringIO()
330
 
        def only_f2(path, file_id):
331
 
            return path == 'f2'
332
 
        _mod_delta.report_delta(out, d, short_status=True, filter=only_f2)
333
 
        self.assertEquals("A  f2\n", out.getvalue())
334
 
 
335
 
    def test_delta_show_long_status_single_file_filter(self):
336
 
        d, long_status, short_status = self._get_delta()
337
 
        out = StringIO()
338
 
        def only_f2(path, file_id):
339
 
            return path == 'f2'
340
 
        _mod_delta.report_delta(out, d, short_status=False, filter=only_f2)
341
 
        self.assertEquals("added:\n  f2\n", out.getvalue())
342
 
 
343
 
    def test_delta_show_short_status_single_file_id_filter(self):
344
 
        d, long_status, short_status = self._get_delta()
345
 
        out = StringIO()
 
349
        _mod_delta.report_delta(out, d, short_status=True, predicate=always)
 
350
        self.assertEqual(short_status, out.getvalue())
 
351
 
 
352
    def test_short_status_path_predicate(self):
 
353
        d, long_status, short_status = self._get_delta()
 
354
        out = StringIO()
 
355
 
 
356
        def only_f2(path, file_id):
 
357
            return path == 'f2'
 
358
        _mod_delta.report_delta(out, d, short_status=True, predicate=only_f2)
 
359
        self.assertEqual("A  f2\n", out.getvalue())
 
360
 
 
361
    def test_long_status_path_predicate(self):
 
362
        d, long_status, short_status = self._get_delta()
 
363
        out = StringIO()
 
364
 
 
365
        def only_f2(path, file_id):
 
366
            return path == 'f2'
 
367
        _mod_delta.report_delta(out, d, short_status=False, predicate=only_f2)
 
368
        self.assertEqual("added:\n  f2\n", out.getvalue())
 
369
 
 
370
    def test_long_status_id_predicate(self):
 
371
        d, long_status, short_status = self._get_delta()
 
372
        out = StringIO()
 
373
 
346
374
        def only_f2_id(path, file_id):
347
 
            return file_id == 'f2-id'
348
 
        _mod_delta.report_delta(out, d, short_status=True, filter=only_f2_id)
349
 
        self.assertEquals("A  f2\n", out.getvalue())
350
 
 
 
375
            return file_id == b'f2-id'
 
376
        _mod_delta.report_delta(out, d, predicate=only_f2_id)
 
377
        self.assertEqual("added:\n  f2\n", out.getvalue())