Merge lp:~bialix/bzr-colo/dash-b into lp:bzr-colo

[Alexander Belchenko]

[Alexander Belchenko (bialix)]

This branch adds -b as short name for --create option of colo-checkout command. Based on my patch to rename colo-clone to colo-checkout.

=== modified file 'commands.py'
--- commands.py	2010-02-06 14:17:12 +0000
+++ commands.py	2010-02-06 14:17:12 +0000
@@ -269,8 +269,8 @@
     alises = ['colo-co']
     takes_args = ['to_directory']
     takes_options = [
-        option.Option('create',
-               help="Also create a new colocated branch by this name"""),
+        option.Option('create', short_name='b',
+               help="Also create a new colocated branch by this name"),
         ]
 
     def run(self, to_directory, create=False):

=== modified file 'tests/test_colo.py'
--- tests/test_colo.py	2010-02-06 14:17:12 +0000
+++ tests/test_colo.py	2010-02-06 14:17:12 +0000
@@ -425,6 +425,25 @@
   trunk
 """)
 
+    def test_checkout_create_dash_b(self):
+        self.run_script("""
+$ bzr colo-init branch
+$ cd branch
+$ bzr colo-checkout -b ../fix1
+$ bzr colo-branches
+  fix1
+* trunk
+$ bzr nick
+trunk
+$ cd ../fix1
+$ cat .bzr/README
+$ bzr nick
+fix1
+$ bzr colo-branches
+* fix1
+  trunk
+""")
+
     def test_checkout_in_directory(self):
         self.run_script("""
 $ bzr colo-init