← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_delta.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 19:26:41 UTC
  • mto: This revision was merged to the branch mainline in revision 6616.
  • Revision ID: v.ladeuil+lp@free.fr-20160201192641-mzn90m51rydhw00n
Open trunk again as 2.8b1

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_delta.py
1
 
# Copyright (C) 2007 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
65
65
        reporter.report(file_id, (old_path, path), versioned_change, renamed,
66
66
            modified, exe_change, kind)
67
67
        if expected_lines is not None:
68
 
            for i in range(len(expected_lines)):
69
 
                self.assertEqualDiff(expected_lines[i], result[i])
 
68
            self.assertEqualDiff('\n'.join(expected_lines), '\n'.join(result))
70
69
        else:
71
70
            self.assertEqual([], result)
72
71
 
123
122
            renamed=False, modified='created', exe_change=False,
124
123
            kind=(None, 'file'), unversioned_filter=lambda x:True)
125
124
 
 
125
    def test_missing(self):
 
126
        self.assertReport('+!  missing.c', file_id=None, path='missing.c',
 
127
             old_path=None, versioned_change='added',
 
128
             renamed=False, modified='missing', exe_change=False,
 
129
             kind=(None, None))
 
130
 
126
131
    def test_view_filtering(self):
127
132
        # If a file in within the view, it should appear in the output
128
133
        expected_lines = [
221
226
 
222
227
    def show_string(self, delta, *args,  **kwargs):
223
228
        to_file = StringIO()
224
 
        delta.show(to_file, *args, **kwargs)
 
229
        _mod_delta.report_delta(to_file, delta, *args, **kwargs)
225
230
        return to_file.getvalue()
226
231
 
227
232
    def test_kind_change(self):
280
285
                                  ('branch/f2', '2\n'),
281
286
                                  ('branch/f3', '3\n'),
282
287
                                  ('branch/f4', '4\n'),
 
288
                                  ('branch/f5', '5\n'),
283
289
                                  ('branch/dir/',),
284
290
                                 ])
285
291
        wt.add(['f1', 'f2', 'f3', 'f4', 'dir'],
286
292
               ['f1-id', 'f2-id', 'f3-id', 'f4-id', 'dir-id'])
287
293
        wt.commit('commit one', rev_id='1')
288
294
 
 
295
        # TODO add rename,removed,etc. here?
 
296
        wt.add('f5')
 
297
        os.unlink('branch/f5')
 
298
 
289
299
        long_status = """added:
290
300
  dir/
291
301
  f1
292
302
  f2
293
303
  f3
294
304
  f4
 
305
missing:
 
306
  f5
295
307
"""
296
308
        short_status = """A  dir/
297
309
A  f1
298
310
A  f2
299
311
A  f3
300
312
A  f4
 
313
!  f5
301
314
"""
302
315
 
303
316
        repo = wt.branch.repository
307
320
    def test_delta_show_short_status_no_filter(self):
308
321
        d, long_status, short_status = self._get_delta()
309
322
        out = StringIO()
310
 
        d.show(out, short_status=True)
311
 
        self.assertEquals(short_status, out.getvalue())
 
323
        _mod_delta.report_delta(out, d, short_status=True)
 
324
        self.assertEqual(short_status, out.getvalue())
312
325
 
313
326
    def test_delta_show_long_status_no_filter(self):
314
327
        d, long_status, short_status = self._get_delta()
315
328
        out = StringIO()
316
 
        d.show(out, short_status=False)
317
 
        self.assertEquals(long_status, out.getvalue())
 
329
        _mod_delta.report_delta(out, d, short_status=False)
 
330
        self.assertEqual(long_status, out.getvalue())
318
331
 
319
332
    def test_delta_show_no_filter(self):
320
333
        d, long_status, short_status = self._get_delta()
321
334
        out = StringIO()
322
335
        def not_a_filter(path, file_id):
323
336
            return True
324
 
        d.show(out, short_status=True, filter=not_a_filter)
325
 
        self.assertEquals(short_status, out.getvalue())
 
337
        _mod_delta.report_delta(out, d, short_status=True, filter=not_a_filter)
 
338
        self.assertEqual(short_status, out.getvalue())
326
339
 
327
340
    def test_delta_show_short_status_single_file_filter(self):
328
341
        d, long_status, short_status = self._get_delta()
329
342
        out = StringIO()
330
343
        def only_f2(path, file_id):
331
344
            return path == 'f2'
332
 
        d.show(out, short_status=True, filter=only_f2)
333
 
        self.assertEquals("A  f2\n", out.getvalue())
 
345
        _mod_delta.report_delta(out, d, short_status=True, filter=only_f2)
 
346
        self.assertEqual("A  f2\n", out.getvalue())
334
347
 
335
348
    def test_delta_show_long_status_single_file_filter(self):
336
349
        d, long_status, short_status = self._get_delta()
337
350
        out = StringIO()
338
351
        def only_f2(path, file_id):
339
352
            return path == 'f2'
340
 
        d.show(out, short_status=False, filter=only_f2)
341
 
        self.assertEquals("added:\n  f2\n", out.getvalue())
 
353
        _mod_delta.report_delta(out, d, short_status=False, filter=only_f2)
 
354
        self.assertEqual("added:\n  f2\n", out.getvalue())
342
355
 
343
356
    def test_delta_show_short_status_single_file_id_filter(self):
344
357
        d, long_status, short_status = self._get_delta()
345
358
        out = StringIO()
346
359
        def only_f2_id(path, file_id):
347
360
            return file_id == 'f2-id'
348
 
        d.show(out, short_status=True, filter=only_f2_id)
349
 
        self.assertEquals("A  f2\n", out.getvalue())
 
361
        _mod_delta.report_delta(out, d, short_status=True, filter=only_f2_id)
 
362
        self.assertEqual("A  f2\n", out.getvalue())
350
363