/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_commit.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_commit.py
163
163
            [('missing', u'hello'), ('deleted', u'hello')],
164
164
            reporter.calls)
165
165
 
166
 
        tree = b.repository.revision_tree('rev2')
 
166
        tree = b.repository.revision_tree(b'rev2')
167
167
        self.assertFalse(tree.has_id(b'hello-id'))
168
168
 
169
169
    def test_partial_commit_move(self):
238
238
        eq = self.assertEqual
239
239
        eq(b.revno(), 3)
240
240
 
241
 
        tree2 = b.repository.revision_tree('test@rev-2')
 
241
        tree2 = b.repository.revision_tree(b'test@rev-2')
242
242
        tree2.lock_read()
243
243
        self.addCleanup(tree2.unlock)
244
244
        self.assertTrue(tree2.has_filename('hello'))
245
245
        self.assertEqual(tree2.get_file_text('hello'), 'hello')
246
246
        self.assertEqual(tree2.get_file_text('buongia'), 'new text')
247
247
 
248
 
        tree3 = b.repository.revision_tree('test@rev-3')
 
248
        tree3 = b.repository.revision_tree(b'test@rev-3')
249
249
        tree3.lock_read()
250
250
        self.addCleanup(tree3.unlock)
251
251
        self.assertFalse(tree3.has_filename('hello'))
345
345
        wt.remove('hello')
346
346
        wt.commit('removed hello', rev_id=b'rev2')
347
347
 
348
 
        tree = b.repository.revision_tree('rev2')
349
 
        self.assertFalse(tree.has_id('hello-id'))
 
348
        tree = b.repository.revision_tree(b'rev2')
 
349
        self.assertFalse(tree.has_id(b'hello-id'))
350
350
 
351
351
    def test_committed_ancestry(self):
352
352
        """Test commit appends revisions to ancestry."""
370
370
        b = wt.branch
371
371
        self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
372
372
        wt.add(['dir', 'dir/file1', 'dir/file2'],
373
 
              ['dirid', 'file1id', 'file2id'])
 
373
              [b'dirid', b'file1id', b'file2id'])
374
374
        wt.commit('dir/file1', specific_files=['dir/file1'], rev_id=b'1')
375
 
        inv = b.repository.get_inventory('1')
376
 
        self.assertEqual('1', inv.get_entry('dirid').revision)
377
 
        self.assertEqual('1', inv.get_entry('file1id').revision)
 
375
        inv = b.repository.get_inventory(b'1')
 
376
        self.assertEqual(b'1', inv.get_entry(b'dirid').revision)
 
377
        self.assertEqual(b'1', inv.get_entry(b'file1id').revision)
378
378
        # FIXME: This should raise a KeyError I think, rbc20051006
379
 
        self.assertRaises(BzrError, inv.get_entry, 'file2id')
 
379
        self.assertRaises(BzrError, inv.get_entry, b'file2id')
380
380
 
381
381
    def test_strict_commit(self):
382
382
        """Try and commit with unknown files and strict = True, should fail."""
450
450
        wt = self.make_branch_and_tree('.')
451
451
        branch = wt.branch
452
452
        wt.commit("base", allow_pointless=True, rev_id=b'A')
453
 
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
 
453
        self.assertFalse(branch.repository.has_signature_for_revision_id(b'A'))
454
454
        try:
455
455
            # monkey patch gpg signing mechanism
456
456
            breezy.gpg.GPGStrategy = breezy.gpg.DisabledGPGStrategy
464
464
                              rev_id=b'B',
465
465
                              working_tree=wt)
466
466
            branch = Branch.open(self.get_url('.'))
467
 
            self.assertEqual(branch.last_revision(), 'A')
468
 
            self.assertFalse(branch.repository.has_revision('B'))
 
467
            self.assertEqual(branch.last_revision(), b'A')
 
468
            self.assertFalse(branch.repository.has_revision(b'B'))
469
469
        finally:
470
470
            breezy.gpg.GPGStrategy = oldstrategy
471
471
 
628
628
        tree.commit('added a', timestamp=1153248633.4186721, timezone=0,
629
629
                    rev_id=b'a1')
630
630
 
631
 
        rev = tree.branch.repository.get_revision('a1')
 
631
        rev = tree.branch.repository.get_revision(b'a1')
632
632
        self.assertEqual(1153248633.419, rev.timestamp)
633
633
 
634
634
    def test_commit_has_1ms_resolution(self):
638
638
        tree.add('a')
639
639
        tree.commit('added a', rev_id=b'a1')
640
640
 
641
 
        rev = tree.branch.repository.get_revision('a1')
 
641
        rev = tree.branch.repository.get_revision(b'a1')
642
642
        timestamp = rev.timestamp
643
643
        timestamp_1ms = round(timestamp, 3)
644
644
        self.assertEqual(timestamp_1ms, timestamp)
830
830
        branch = controldir.ControlDir.create_branch_convenience('repo/branch')
831
831
        tree2 = branch.create_checkout('repo/tree2')
832
832
        tree2.commit('message', rev_id=b'rev1')
833
 
        self.assertTrue(tree2.branch.repository.has_revision('rev1'))
 
833
        self.assertTrue(tree2.branch.repository.has_revision(b'rev1'))
834
834
 
835
835
 
836
836
class FilterExcludedTests(TestCase):