← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_diff.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-19 10:42:59 UTC
  • mto: This revision was merged to the branch mainline in revision 5806.
  • Revision ID: jelmer@samba.org-20110419104259-g9exlcp1f5jdu3ci
Move Inventory._get_mutable_inventory -> mutable_inventory_from_tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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
33
33
    transform,
34
34
    )
35
35
from bzrlib.symbol_versioning import deprecated_in
36
 
from bzrlib.tests import test_win32utils
 
36
from bzrlib.tests import features
 
37
from bzrlib.tests.blackbox.test_diff import subst_dates
37
38
 
38
39
 
39
40
class _AttribFeature(tests.Feature):
143
144
        self.check_patch(lines)
144
145
 
145
146
    def test_external_diff_binary_lang_c(self):
146
 
        old_env = {}
147
147
        for lang in ('LANG', 'LC_ALL', 'LANGUAGE'):
148
 
            old_env[lang] = osutils.set_or_unset_env(lang, 'C')
149
 
        try:
150
 
            lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
151
 
            # Older versions of diffutils say "Binary files", newer
152
 
            # versions just say "Files".
153
 
            self.assertContainsRe(lines[0],
154
 
                                  '(Binary f|F)iles old and new differ\n')
155
 
            self.assertEquals(lines[1:], ['\n'])
156
 
        finally:
157
 
            for lang, old_val in old_env.iteritems():
158
 
                osutils.set_or_unset_env(lang, old_val)
 
148
            self.overrideEnv(lang, 'C')
 
149
        lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
 
150
        # Older versions of diffutils say "Binary files", newer
 
151
        # versions just say "Files".
 
152
        self.assertContainsRe(lines[0], '(Binary f|F)iles old and new differ\n')
 
153
        self.assertEquals(lines[1:], ['\n'])
159
154
 
160
155
    def test_no_external_diff(self):
161
156
        """Check that NoDiff is raised when diff is not available"""
162
 
        # Use os.environ['PATH'] to make sure no 'diff' command is available
163
 
        orig_path = os.environ['PATH']
164
 
        try:
165
 
            os.environ['PATH'] = ''
166
 
            self.assertRaises(errors.NoDiff, diff.external_diff,
167
 
                              'old', ['boo\n'], 'new', ['goo\n'],
168
 
                              StringIO(), diff_opts=['-u'])
169
 
        finally:
170
 
            os.environ['PATH'] = orig_path
 
157
        # Make sure no 'diff' command is available
 
158
        # XXX: Weird, using None instead of '' breaks the test -- vila 20101216
 
159
        self.overrideEnv('PATH', '')
 
160
        self.assertRaises(errors.NoDiff, diff.external_diff,
 
161
                          'old', ['boo\n'], 'new', ['goo\n'],
 
162
                          StringIO(), diff_opts=['-u'])
171
163
 
172
164
    def test_internal_diff_default(self):
173
165
        # Default internal diff encoding is utf8
234
226
        output = StringIO.StringIO()
235
227
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
236
228
                            u'new_\xe5', ['new_text\n'], output)
237
 
        self.failUnless(isinstance(output.getvalue(), str),
 
229
        self.assertIsInstance(output.getvalue(), str,
238
230
            'internal_diff should return bytestrings')
239
231
 
240
232
 
257
249
        self.assertEqual(out.splitlines(True) + ['\n'], lines)
258
250
 
259
251
 
260
 
class TestShowDiffTreesHelper(tests.TestCaseWithTransport):
261
 
    """Has a helper for running show_diff_trees"""
262
 
 
263
 
    def get_diff(self, tree1, tree2, specific_files=None, working_tree=None):
264
 
        output = StringIO()
265
 
        if working_tree is not None:
266
 
            extra_trees = (working_tree,)
267
 
        else:
268
 
            extra_trees = ()
269
 
        diff.show_diff_trees(tree1, tree2, output,
270
 
                             specific_files=specific_files,
271
 
                             extra_trees=extra_trees, old_label='old/',
272
 
                             new_label='new/')
273
 
        return output.getvalue()
274
 
 
275
 
 
276
 
class TestDiffDates(TestShowDiffTreesHelper):
 
252
def get_diff_as_string(tree1, tree2, specific_files=None, working_tree=None):
 
253
    output = StringIO()
 
254
    if working_tree is not None:
 
255
        extra_trees = (working_tree,)
 
256
    else:
 
257
        extra_trees = ()
 
258
    diff.show_diff_trees(tree1, tree2, output,
 
259
        specific_files=specific_files,
 
260
        extra_trees=extra_trees, old_label='old/',
 
261
        new_label='new/')
 
262
    return output.getvalue()
 
263
 
 
264
 
 
265
class TestDiffDates(tests.TestCaseWithTransport):
277
266
 
278
267
    def setUp(self):
279
268
        super(TestDiffDates, self).setUp()
314
303
        os.utime('file1', (1144195200, 1144195200)) # 2006-04-05 00:00:00 UTC
315
304
 
316
305
    def test_diff_rev_tree_working_tree(self):
317
 
        output = self.get_diff(self.wt.basis_tree(), self.wt)
 
306
        output = get_diff_as_string(self.wt.basis_tree(), self.wt)
318
307
        # note that the date for old/file1 is from rev 2 rather than from
319
308
        # the basis revision (rev 4)
320
309
        self.assertEqualDiff(output, '''\
330
319
    def test_diff_rev_tree_rev_tree(self):
331
320
        tree1 = self.b.repository.revision_tree('rev-2')
332
321
        tree2 = self.b.repository.revision_tree('rev-3')
333
 
        output = self.get_diff(tree1, tree2)
 
322
        output = get_diff_as_string(tree1, tree2)
334
323
        self.assertEqualDiff(output, '''\
335
324
=== modified file 'file2'
336
325
--- old/file2\t2006-04-01 00:00:00 +0000
344
333
    def test_diff_add_files(self):
345
334
        tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
346
335
        tree2 = self.b.repository.revision_tree('rev-1')
347
 
        output = self.get_diff(tree1, tree2)
 
336
        output = get_diff_as_string(tree1, tree2)
348
337
        # the files have the epoch time stamp for the tree in which
349
338
        # they don't exist.
350
339
        self.assertEqualDiff(output, '''\
365
354
    def test_diff_remove_files(self):
366
355
        tree1 = self.b.repository.revision_tree('rev-3')
367
356
        tree2 = self.b.repository.revision_tree('rev-4')
368
 
        output = self.get_diff(tree1, tree2)
 
357
        output = get_diff_as_string(tree1, tree2)
369
358
        # the file has the epoch time stamp for the tree in which
370
359
        # it doesn't exist.
371
360
        self.assertEqualDiff(output, '''\
382
371
        self.wt.rename_one('file1', 'file1b')
383
372
        old_tree = self.b.repository.revision_tree('rev-1')
384
373
        new_tree = self.b.repository.revision_tree('rev-4')
385
 
        out = self.get_diff(old_tree, new_tree, specific_files=['file1b'],
 
374
        out = get_diff_as_string(old_tree, new_tree, specific_files=['file1b'],
386
375
                            working_tree=self.wt)
387
376
        self.assertContainsRe(out, 'file1\t')
388
377
 
394
383
        self.wt.rename_one('file1', 'dir1/file1')
395
384
        old_tree = self.b.repository.revision_tree('rev-1')
396
385
        new_tree = self.b.repository.revision_tree('rev-4')
397
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir1'],
 
386
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir1'],
398
387
                            working_tree=self.wt)
399
388
        self.assertContainsRe(out, 'file1\t')
400
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir2'],
 
389
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir2'],
401
390
                            working_tree=self.wt)
402
391
        self.assertNotContainsRe(out, 'file1\t')
403
392
 
404
393
 
405
 
 
406
 
class TestShowDiffTrees(TestShowDiffTreesHelper):
 
394
class TestShowDiffTrees(tests.TestCaseWithTransport):
407
395
    """Direct tests for show_diff_trees"""
408
396
 
409
397
    def test_modified_file(self):
414
402
        tree.commit('one', rev_id='rev-1')
415
403
 
416
404
        self.build_tree_contents([('tree/file', 'new contents\n')])
417
 
        d = self.get_diff(tree.basis_tree(), tree)
 
405
        d = get_diff_as_string(tree.basis_tree(), tree)
418
406
        self.assertContainsRe(d, "=== modified file 'file'\n")
419
407
        self.assertContainsRe(d, '--- old/file\t')
420
408
        self.assertContainsRe(d, '\\+\\+\\+ new/file\t')
431
419
 
432
420
        tree.rename_one('dir', 'other')
433
421
        self.build_tree_contents([('tree/other/file', 'new contents\n')])
434
 
        d = self.get_diff(tree.basis_tree(), tree)
 
422
        d = get_diff_as_string(tree.basis_tree(), tree)
435
423
        self.assertContainsRe(d, "=== renamed directory 'dir' => 'other'\n")
436
424
        self.assertContainsRe(d, "=== modified file 'other/file'\n")
437
425
        # XXX: This is technically incorrect, because it used to be at another
450
438
        tree.commit('one', rev_id='rev-1')
451
439
 
452
440
        tree.rename_one('dir', 'newdir')
453
 
        d = self.get_diff(tree.basis_tree(), tree)
 
441
        d = get_diff_as_string(tree.basis_tree(), tree)
454
442
        # Renaming a directory should be a single "you renamed this dir" even
455
443
        # when there are files inside.
456
444
        self.assertEqual(d, "=== renamed directory 'dir' => 'newdir'\n")
463
451
        tree.commit('one', rev_id='rev-1')
464
452
 
465
453
        tree.rename_one('file', 'newname')
466
 
        d = self.get_diff(tree.basis_tree(), tree)
 
454
        d = get_diff_as_string(tree.basis_tree(), tree)
467
455
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
468
456
        # We shouldn't have a --- or +++ line, because there is no content
469
457
        # change
478
466
 
479
467
        tree.rename_one('file', 'newname')
480
468
        self.build_tree_contents([('tree/newname', 'new contents\n')])
481
 
        d = self.get_diff(tree.basis_tree(), tree)
 
469
        d = get_diff_as_string(tree.basis_tree(), tree)
482
470
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
483
471
        self.assertContainsRe(d, '--- old/file\t')
484
472
        self.assertContainsRe(d, '\\+\\+\\+ new/newname\t')
508
496
        tree.rename_one('c', 'new-c')
509
497
        tree.rename_one('d', 'new-d')
510
498
 
511
 
        d = self.get_diff(tree.basis_tree(), tree)
 
499
        d = get_diff_as_string(tree.basis_tree(), tree)
512
500
 
513
501
        self.assertContainsRe(d, r"file 'a'.*\(properties changed:"
514
502
                                  ".*\+x to -x.*\)")
521
509
        self.assertNotContainsRe(d, r"file 'e'")
522
510
        self.assertNotContainsRe(d, r"file 'f'")
523
511
 
524
 
 
525
512
    def test_binary_unicode_filenames(self):
526
513
        """Test that contents of files are *not* encoded in UTF-8 when there
527
514
        is a binary file in the diff.
573
560
        tree.add(['add_'+alpha], ['file-id'])
574
561
        self.build_tree_contents([('tree/mod_'+alpha, 'contents_mod\n')])
575
562
 
576
 
        d = self.get_diff(tree.basis_tree(), tree)
 
563
        d = get_diff_as_string(tree.basis_tree(), tree)
577
564
        self.assertContainsRe(d,
578
565
                "=== renamed file 'ren_%s' => 'ren_%s'\n"%(autf8, outf8))
579
566
        self.assertContainsRe(d, "=== added file 'add_%s'"%autf8)
580
567
        self.assertContainsRe(d, "=== modified file 'mod_%s'"%autf8)
581
568
        self.assertContainsRe(d, "=== removed file 'del_%s'"%autf8)
582
569
 
 
570
    def test_unicode_filename_path_encoding(self):
 
571
        """Test for bug #382699: unicode filenames on Windows should be shown
 
572
        in user encoding.
 
573
        """
 
574
        self.requireFeature(tests.UnicodeFilenameFeature)
 
575
        # The word 'test' in Russian
 
576
        _russian_test = u'\u0422\u0435\u0441\u0442'
 
577
        directory = _russian_test + u'/'
 
578
        test_txt = _russian_test + u'.txt'
 
579
        u1234 = u'\u1234.txt'
 
580
 
 
581
        tree = self.make_branch_and_tree('.')
 
582
        self.build_tree_contents([
 
583
            (test_txt, 'foo\n'),
 
584
            (u1234, 'foo\n'),
 
585
            (directory, None),
 
586
            ])
 
587
        tree.add([test_txt, u1234, directory])
 
588
 
 
589
        sio = StringIO()
 
590
        diff.show_diff_trees(tree.basis_tree(), tree, sio,
 
591
            path_encoding='cp1251')
 
592
 
 
593
        output = subst_dates(sio.getvalue())
 
594
        shouldbe = ('''\
 
595
=== added directory '%(directory)s'
 
596
=== added file '%(test_txt)s'
 
597
--- a/%(test_txt)s\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
598
+++ b/%(test_txt)s\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
599
@@ -0,0 +1,1 @@
 
600
+foo
 
601
 
 
602
=== added file '?.txt'
 
603
--- a/?.txt\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
604
+++ b/?.txt\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
605
@@ -0,0 +1,1 @@
 
606
+foo
 
607
 
 
608
''' % {'directory': _russian_test.encode('cp1251'),
 
609
       'test_txt': test_txt.encode('cp1251'),
 
610
      })
 
611
        self.assertEqualDiff(output, shouldbe)
 
612
 
583
613
 
584
614
class DiffWasIs(diff.DiffPath):
585
615
 
1298
1328
                         diff_obj._get_command('old-path', 'new-path'))
1299
1329
 
1300
1330
    def test_from_string_path_with_backslashes(self):
1301
 
        self.requireFeature(test_win32utils.BackslashDirSeparatorFeature)
 
1331
        self.requireFeature(features.backslashdir_feature)
1302
1332
        tool = 'C:\\Tools\\Diff.exe'
1303
1333
        diff_obj = diff.DiffFromTool.from_string(tool, None, None, None)
1304
1334
        self.addCleanup(diff_obj.finish)
1450
1480
        return self.applyDeprecated(
1451
1481
            deprecated_in((2, 2, 0)), diff.get_trees_and_branches_to_diff,
1452
1482
            path_list, revision_specs, old_url, new_url)
1453