/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-10-13 22:53:02 UTC
  • mfrom: (7290.1.35 work)
  • mto: This revision was merged to the branch mainline in revision 7405.
  • Revision ID: jelmer@jelmer.uk-20191013225302-vg88ztajzq05hkas
Merge lp:brz/3.0.

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