/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-02-18 21:42:57 UTC
  • mto: This revision was merged to the branch mainline in revision 6859.
  • Revision ID: jelmer@jelmer.uk-20180218214257-jpevutp1wa30tz3v
Update TODO to reference Breezy, not Bazaar.

Show diffs side-by-side

added added

removed removed

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