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

  • Committer: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

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