/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_diff.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-21 17:53:38 UTC
  • mfrom: (6973.5.13 python3-c)
  • Revision ID: jelmer@jelmer.uk-20180621175338-v7loaib7mh7pfosf
Merge lp:~jelmer/brz/python3-c

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_diff.py
403
403
''')
404
404
 
405
405
    def test_diff_rev_tree_rev_tree(self):
406
 
        tree1 = self.b.repository.revision_tree('rev-2')
407
 
        tree2 = self.b.repository.revision_tree('rev-3')
 
406
        tree1 = self.b.repository.revision_tree(b'rev-2')
 
407
        tree2 = self.b.repository.revision_tree(b'rev-3')
408
408
        output = get_diff_as_string(tree1, tree2)
409
409
        self.assertEqualDiff(output, '''\
410
410
=== modified file 'file2'
418
418
 
419
419
    def test_diff_add_files(self):
420
420
        tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
421
 
        tree2 = self.b.repository.revision_tree('rev-1')
 
421
        tree2 = self.b.repository.revision_tree(b'rev-1')
422
422
        output = get_diff_as_string(tree1, tree2)
423
423
        # the files have the epoch time stamp for the tree in which
424
424
        # they don't exist.
438
438
''')
439
439
 
440
440
    def test_diff_remove_files(self):
441
 
        tree1 = self.b.repository.revision_tree('rev-3')
442
 
        tree2 = self.b.repository.revision_tree('rev-4')
 
441
        tree1 = self.b.repository.revision_tree(b'rev-3')
 
442
        tree2 = self.b.repository.revision_tree(b'rev-4')
443
443
        output = get_diff_as_string(tree1, tree2)
444
444
        # the file has the epoch time stamp for the tree in which
445
445
        # it doesn't exist.
455
455
    def test_show_diff_specified(self):
456
456
        """A working tree filename can be used to identify a file"""
457
457
        self.wt.rename_one('file1', 'file1b')
458
 
        old_tree = self.b.repository.revision_tree('rev-1')
459
 
        new_tree = self.b.repository.revision_tree('rev-4')
 
458
        old_tree = self.b.repository.revision_tree(b'rev-1')
 
459
        new_tree = self.b.repository.revision_tree(b'rev-4')
460
460
        out = get_diff_as_string(old_tree, new_tree, specific_files=['file1b'],
461
461
                            working_tree=self.wt)
462
462
        self.assertContainsRe(out, 'file1\t')
467
467
        os.mkdir('dir2')
468
468
        self.wt.add(['dir1', 'dir2'])
469
469
        self.wt.rename_one('file1', 'dir1/file1')
470
 
        old_tree = self.b.repository.revision_tree('rev-1')
471
 
        new_tree = self.b.repository.revision_tree('rev-4')
 
470
        old_tree = self.b.repository.revision_tree(b'rev-1')
 
471
        new_tree = self.b.repository.revision_tree(b'rev-4')
472
472
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir1'],
473
473
                            working_tree=self.wt)
474
474
        self.assertContainsRe(out, 'file1\t')