Rev 2470: Add BranchBuilder.get_branch(). in file:///home/robertc/source/baz/build-branch/

Robert Collins robertc at robertcollins.net
Fri Apr 27 03:31:46 BST 2007


At file:///home/robertc/source/baz/build-branch/

------------------------------------------------------------
revno: 2470
revision-id: robertc at robertcollins.net-20070427023143-na837vjyw8y7ulns
parent: robertc at robertcollins.net-20070427022014-gw8g0qi639fquuba
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 12:31:43 +1000
message:
  Add BranchBuilder.get_branch().
modified:
  bzrlib/branchbuilder.py        branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
  bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
=== modified file 'bzrlib/branchbuilder.py'
--- a/bzrlib/branchbuilder.py	2007-04-27 02:20:14 +0000
+++ b/bzrlib/branchbuilder.py	2007-04-27 02:31:43 +0000
@@ -16,7 +16,7 @@
 
 """Utility for create branches with particular contents."""
 
-from bzrlib import errors
+from bzrlib import bzrdir, errors
 
 
 class BranchBuilder(object):
@@ -24,3 +24,11 @@
 
     def __init__(self, transport):
         """Construct a BranchBuilder on transport."""
+        if not transport.has('.'):
+            transport.mkdir('.')
+        self._branch = bzrdir.BzrDir.create_branch_convenience(transport.base,
+            format=bzrdir.format_registry.make_bzrdir('default'))
+
+    def get_branch(self):
+        """Return the branch created by the builder."""
+        return self._branch

=== modified file 'bzrlib/tests/test_branchbuilder.py'
--- a/bzrlib/tests/test_branchbuilder.py	2007-04-27 02:20:14 +0000
+++ b/bzrlib/tests/test_branchbuilder.py	2007-04-27 02:31:43 +0000
@@ -16,7 +16,11 @@
 
 """Tests for the BranchBuilder class."""
 
-from bzrlib import tests
+from bzrlib import (
+    branch as _mod_branch,
+    revision as _mod_revision,
+    tests,
+    )
 from bzrlib.branchbuilder import BranchBuilder
 
 
@@ -26,3 +30,14 @@
         """Test the constructor api."""
         builder = BranchBuilder(self.get_transport().clone('foo'))
         # we dont care if the branch has been built or not at this point.
+
+    def test_get_branch(self):
+        """get_branch returns the created branch."""
+        builder = BranchBuilder(self.get_transport().clone('foo'))
+        branch = builder.get_branch()
+        self.assertIsInstance(branch, _mod_branch.Branch)
+        self.assertEqual(self.get_transport().clone('foo').base,
+            branch.base)
+        self.assertEqual(
+            (0, _mod_revision.NULL_REVISION),
+            branch.last_revision_info())



More information about the bazaar-commits mailing list