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

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 12:47:13 UTC
  • mfrom: (6928 work)
  • mto: (6940.2.6 base)
  • mto: This revision was merged to the branch mainline in revision 6941.
  • Revision ID: jelmer@jelmer.uk-20180325124713-dq64vm9bhch1gjow
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_annotate.py
399
399
    def test_annotate_unicode_author(self):
400
400
        tree1 = self.make_branch_and_tree('tree1')
401
401
 
402
 
        self.build_tree_contents([('tree1/a', 'adi\xc3\xb3s')])
403
 
        tree1.add(['a'], ['a-id'])
404
 
        tree1.commit('a', rev_id='rev-1',
 
402
        self.build_tree_contents([('tree1/a', b'adi\xc3\xb3s')])
 
403
        tree1.add(['a'], [b'a-id'])
 
404
        tree1.commit('a', rev_id=b'rev-1',
405
405
                     committer=u'Pepe P\xe9rez <pperez@ejemplo.com>',
406
406
                     timestamp=1166046000.00, timezone=0)
407
407
 
408
 
        self.build_tree_contents([('tree1/b', 'bye')])
409
 
        tree1.add(['b'], ['b-id'])
410
 
        tree1.commit('b', rev_id='rev-2',
 
408
        self.build_tree_contents([('tree1/b', b'bye')])
 
409
        tree1.add(['b'], [b'b-id'])
 
410
        tree1.commit('b', rev_id=b'rev-2',
411
411
                     committer=u'p\xe9rez',
412
412
                     timestamp=1166046000.00, timezone=0)
413
413
 
437
437
    def test_annotate_author_or_committer(self):
438
438
        tree1 = self.make_branch_and_tree('tree1')
439
439
 
440
 
        self.build_tree_contents([('tree1/a', 'hello')])
441
 
        tree1.add(['a'], ['a-id'])
442
 
        tree1.commit('a', rev_id='rev-1',
 
440
        self.build_tree_contents([('tree1/a', b'hello')])
 
441
        tree1.add(['a'], [b'a-id'])
 
442
        tree1.commit('a', rev_id=b'rev-1',
443
443
                     committer='Committer <committer@example.com>',
444
444
                     timestamp=1166046000.00, timezone=0)
445
445
 
446
 
        self.build_tree_contents([('tree1/b', 'bye')])
447
 
        tree1.add(['b'], ['b-id'])
448
 
        tree1.commit('b', rev_id='rev-2',
 
446
        self.build_tree_contents([('tree1/b', b'bye')])
 
447
        tree1.add(['b'], [b'b-id'])
 
448
        tree1.commit('b', rev_id=b'rev-2',
449
449
                     committer='Committer <committer@example.com>',
450
450
                     authors=['Author <author@example.com>'],
451
451
                     timestamp=1166046000.00, timezone=0)