← Back to branch summary

~jelmer/brz/tree-reference-fixes

« back to all changes in this revision

Viewing changes to breezy/tests/test_revisionspec.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 12:47:13 UTC
  • mfrom: (6926.1.2 work)
  • Revision ID: jelmer@jelmer.uk-20180325124713-dq64vm9bhch1gjow
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_revisionspec.py
50
50
        self.tree.lock_write()
51
51
        self.addCleanup(self.tree.unlock)
52
52
        self.tree.add(['a'])
53
 
        self.tree.commit('a', rev_id='r1')
 
53
        self.tree.commit('a', rev_id=b'r1')
54
54
 
55
55
        self.tree2 = self.tree.controldir.sprout('tree2').open_workingtree()
56
 
        self.tree2.commit('alt', rev_id='alt_r2')
 
56
        self.tree2.commit('alt', rev_id=b'alt_r2')
57
57
 
58
58
        self.tree.merge_from_branch(self.tree2.branch)
59
 
        self.tree.commit('second', rev_id='r2')
 
59
        self.tree.commit('second', rev_id=b'r2')
60
60
 
61
61
    def get_in_history(self, revision_spec):
62
62
        return spec_in_history(revision_spec, self.tree.branch)
171
171
        self.assertAsRevisionId('r2', '3')
172
172
        self.build_tree(['tree/b'])
173
173
        self.tree.add(['b'])
174
 
        self.tree.commit('b', rev_id='r3')
 
174
        self.tree.commit('b', rev_id=b'r3')
175
175
        self.assertAsRevisionId('r3', '3')
176
176
 
177
177
    def test_dwim_spec_date(self):
300
300
    def test_different_history_lengths(self):
301
301
        # Make sure we use the revisions and offsets in the supplied branch
302
302
        # not the ones in the original branch.
303
 
        self.tree2.commit('three', rev_id='r3')
 
303
        self.tree2.commit('three', rev_id=b'r3')
304
304
        self.assertInHistoryIs(3, 'r3', 'revno:3:tree2')
305
305
        self.assertInHistoryIs(3, 'r3', 'revno:-1:tree2')
306
306
 
309
309
                          self.get_in_history, 'revno:-1:tree3')
310
310
 
311
311
    def test_invalid_revno_in_branch(self):
312
 
        self.tree.commit('three', rev_id='r3')
 
312
        self.tree.commit('three', rev_id=b'r3')
313
313
        self.assertInvalid('revno:3:tree2')
314
314
 
315
315
    def test_revno_n_path(self):
317
317
        wta = self.make_branch_and_tree('a')
318
318
        ba = wta.branch
319
319
 
320
 
        wta.commit('Commit one', rev_id='a@r-0-1')
321
 
        wta.commit('Commit two', rev_id='a@r-0-2')
322
 
        wta.commit('Commit three', rev_id='a@r-0-3')
 
320
        wta.commit('Commit one', rev_id=b'a@r-0-1')
 
321
        wta.commit('Commit two', rev_id=b'a@r-0-2')
 
322
        wta.commit('Commit three', rev_id=b'a@r-0-3')
323
323
 
324
324
        wtb = self.make_branch_and_tree('b')
325
325
        bb = wtb.branch
326
326
 
327
 
        wtb.commit('Commit one', rev_id='b@r-0-1')
328
 
        wtb.commit('Commit two', rev_id='b@r-0-2')
329
 
        wtb.commit('Commit three', rev_id='b@r-0-3')
 
327
        wtb.commit('Commit one', rev_id=b'b@r-0-1')
 
328
        wtb.commit('Commit two', rev_id=b'b@r-0-2')
 
329
        wtb.commit('Commit three', rev_id=b'b@r-0-3')
330
330
 
331
331
 
332
332
        self.assertEqual((1, 'a@r-0-1'),
379
379
        self.assertInHistoryIs(None, 'alt_r2', 'revid:alt_r2')
380
380
 
381
381
    def test_not_here(self):
382
 
        self.tree2.commit('alt third', rev_id='alt_r3')
 
382
        self.tree2.commit('alt third', rev_id=b'alt_r3')
383
383
        # It exists in tree2, but not in tree
384
384
        self.assertInvalid('revid:alt_r3', invalid_as_revision_id=False)
385
385
 
386
386
    def test_in_repository(self):
387
387
        """We can get any revision id in the repository"""
388
388
        # XXX: This may change in the future, but for now, it is true
389
 
        self.tree2.commit('alt third', rev_id='alt_r3')
 
389
        self.tree2.commit('alt third', rev_id=b'alt_r3')
390
390
        self.tree.branch.fetch(self.tree2.branch, 'alt_r3')
391
391
        self.assertInHistoryIs(None, 'alt_r3', 'revid:alt_r3')
392
392
 
463
463
 
464
464
    def test_alt_no_parents(self):
465
465
        new_tree = self.make_branch_and_tree('new_tree')
466
 
        new_tree.commit('first', rev_id='new_r1')
 
466
        new_tree.commit('first', rev_id=b'new_r1')
467
467
        self.tree.branch.fetch(new_tree.branch, 'new_r1')
468
468
        self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')
469
469
 
513
513
        super(TestRevisionSpec, self).setUp()
514
514
 
515
515
        new_tree = self.make_branch_and_tree('new_tree')
516
 
        new_tree.commit('Commit one', rev_id='new_r1',
 
516
        new_tree.commit('Commit one', rev_id=b'new_r1',
517
517
                        timestamp=time.time() - 60*60*24)
518
 
        new_tree.commit('Commit two', rev_id='new_r2')
519
 
        new_tree.commit('Commit three', rev_id='new_r3')
 
518
        new_tree.commit('Commit two', rev_id=b'new_r2')
 
519
        new_tree.commit('Commit three', rev_id=b'new_r3')
520
520
 
521
521
        self.tree = new_tree
522
522
 
570
570
    def test_unrelated(self):
571
571
        new_tree = self.make_branch_and_tree('new_tree')
572
572
 
573
 
        new_tree.commit('Commit one', rev_id='new_r1')
574
 
        new_tree.commit('Commit two', rev_id='new_r2')
575
 
        new_tree.commit('Commit three', rev_id='new_r3')
 
573
        new_tree.commit('Commit one', rev_id=b'new_r1')
 
574
        new_tree.commit('Commit two', rev_id=b'new_r2')
 
575
        new_tree.commit('Commit three', rev_id=b'new_r3')
576
576
 
577
577
        # With no common ancestor, we should raise another user error
578
578
        self.assertRaises(errors.NoCommonAncestor,
598
598
 
599
599
        # Create a branch with a parent to default to
600
600
        tree3 = self.tree.controldir.sprout('tree3').open_workingtree()
601
 
        tree3.commit('foo', rev_id='r3')
 
601
        tree3.commit('foo', rev_id=b'r3')
602
602
        self.tree = tree3
603
603
        self.assertInHistoryIs(2, 'r2', 'ancestor:')
604
604
 
620
620
    def test_unrelated(self):
621
621
        new_tree = self.make_branch_and_tree('new_tree')
622
622
 
623
 
        new_tree.commit('Commit one', rev_id='new_r1')
624
 
        new_tree.commit('Commit two', rev_id='new_r2')
625
 
        new_tree.commit('Commit three', rev_id='new_r3')
 
623
        new_tree.commit('Commit one', rev_id=b'new_r1')
 
624
        new_tree.commit('Commit two', rev_id=b'new_r2')
 
625
        new_tree.commit('Commit three', rev_id=b'new_r3')
626
626
 
627
627
        self.assertInHistoryIs(None, 'new_r3', 'branch:new_tree')
628
628
 
689
689
    def setUp(self):
690
690
        super(TestRevisionSpec_annotate, self).setUp()
691
691
        self.tree = self.make_branch_and_tree('annotate-tree')
692
 
        self.build_tree_contents([('annotate-tree/file1', '1\n')])
 
692
        self.build_tree_contents([('annotate-tree/file1', b'1\n')])
693
693
        self.tree.add('file1')
694
 
        self.tree.commit('r1', rev_id='r1')
695
 
        self.build_tree_contents([('annotate-tree/file1', '2\n1\n')])
696
 
        self.tree.commit('r2', rev_id='r2')
697
 
        self.build_tree_contents([('annotate-tree/file1', '2\n1\n3\n')])
 
694
        self.tree.commit('r1', rev_id=b'r1')
 
695
        self.build_tree_contents([('annotate-tree/file1', b'2\n1\n')])
 
696
        self.tree.commit('r2', rev_id=b'r2')
 
697
        self.build_tree_contents([('annotate-tree/file1', b'2\n1\n3\n')])
698
698
 
699
699
    def test_as_revision_id_r1(self):
700
700
        self.assertAsRevisionId('r1', 'annotate:annotate-tree/file1:2')