Rev 2806: Set random_revid on CommitBuilder when a commit generated its own revision id. in http://people.ubuntu.com/~robertc/baz2.0/knits

Robert Collins robertc at robertcollins.net
Mon Sep 10 02:27:20 BST 2007


At http://people.ubuntu.com/~robertc/baz2.0/knits

------------------------------------------------------------
revno: 2806
revision-id: robertc at robertcollins.net-20070910012710-bubnul8jp0mr5lhk
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Mon 2007-09-10 11:27:10 +1000
message:
  Set random_revid on CommitBuilder when a commit generated its own revision id.
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-09-03 22:17:20 +0000
+++ b/bzrlib/repository.py	2007-09-10 01:27:10 +0000
@@ -2183,6 +2183,9 @@
         """
         if self._new_revision_id is None:
             self._new_revision_id = self._gen_revision_id()
+            self.random_revid = True
+        else:
+            self.random_revid = False
 
     def _check_root(self, ie, parent_invs, tree):
         """Helper for record_entry_contents.

=== modified file 'bzrlib/tests/repository_implementations/test_commit_builder.py'
--- a/bzrlib/tests/repository_implementations/test_commit_builder.py	2007-09-04 03:53:07 +0000
+++ b/bzrlib/tests/repository_implementations/test_commit_builder.py	2007-09-10 01:27:10 +0000
@@ -34,6 +34,7 @@
         builder = branch.repository.get_commit_builder(
             branch, [], branch.get_config())
         self.assertIsInstance(builder, CommitBuilder)
+        self.assertTrue(builder.random_revid)
         branch.repository.commit_write_group()
         branch.repository.unlock()
 
@@ -101,6 +102,7 @@
             except CannotSetRevisionId:
                 # This format doesn't support supplied revision ids
                 return
+            self.assertFalse(builder.random_revid)
             self.record_root(builder, tree)
             builder.finish_inventory()
             self.assertEqual(revision_id, builder.commit('foo bar'))



More information about the bazaar-commits mailing list