Merge lp:~bialix/bzr-colo/checkout into lp:bzr-colo

[Alexander Belchenko]

[Alexander Belchenko (bialix)]

This patch changed name of colo-clone command to colo-checkout, because actually help and tutorial talk about creating new checkout for existing colo workspace instead of cloning (copy) workspace itself. I think clone is wrong word here and misleading.

=== modified file '__init__.py'
--- __init__.py	2010-01-14 12:55:12 +0000
+++ __init__.py	2010-02-06 14:09:14 +0000
@@ -31,7 +31,7 @@
     * colo-branch
     * colo-branches
     * colo-fetch
-    * colo-clone
+    * colo-checkout
     * colo-prune
     * colo-clean
     * colo-ify
@@ -91,7 +91,7 @@
                  ('cmd_colo_branch', []),
                  ('cmd_colo_branches', []),
                  ('cmd_colo_fetch', []),
-                 ('cmd_colo_clone', []),
+                 ('cmd_colo_checkout', ['colo-co']),
                  ('cmd_colo_prune', []),
                  ('cmd_colo_clean', []),
                  ('cmd_colo_ify', []),

=== modified file 'commands.py'
--- commands.py	2010-01-14 18:34:54 +0000
+++ commands.py	2010-02-06 14:09:14 +0000
@@ -256,7 +256,7 @@
                      remember=True)
 
 
-class cmd_colo_clone(commands.Command):
+class cmd_colo_checkout(commands.Command):
 
     """Create a checkout of this branch in a new directory.
     
@@ -266,6 +266,7 @@
     the new checkout is switched to that new branch.
     """
 
+    alises = ['colo-co']
     takes_args = ['to_directory']
     takes_options = [
         option.Option('create',

=== modified file 'tests/test_colo.py'
--- tests/test_colo.py	2010-02-05 16:31:24 +0000
+++ tests/test_colo.py	2010-02-06 14:09:14 +0000
@@ -380,18 +380,18 @@
 """)
 
 
-class TestColoClone(script.TestCaseWithTransportAndScript):
+class TestColoCheckout(script.TestCaseWithTransportAndScript):
 
-    def test_clone(self):
+    def test_checkout(self):
         self.run_script("""
 $ bzr colo-init branch
 $ cd branch
-$ bzr colo-clone ../branch2
+$ bzr colo-checkout ../branch2
 $ cd ../branch2
 $ cat .bzr/README
 """)
 
-    def test_clone_example(self):
+    def test_checkout_example(self):
         self.run_script("""
 $ bzr colo-init branch
 $ cd branch
@@ -401,16 +401,16 @@
   trunk
 $ bzr switch trunk
 $ bzr colo-branch fix-unicode-normalization
-$ bzr colo-clone ../fix-unicode-normalization
+$ bzr colo-checkout ../fix-unicode-normalization
 $ cd ../fix-unicode-normalization
 $ cat .bzr/README
 """)
 
-    def test_clone_create(self):
+    def test_checkout_create(self):
         self.run_script("""
 $ bzr colo-init branch
 $ cd branch
-$ bzr colo-clone --create ../fix1
+$ bzr colo-checkout --create ../fix1
 $ bzr colo-branches
   fix1
 * trunk
@@ -425,10 +425,10 @@
   trunk
 """)
 
-    def test_clone_in_directory(self):
+    def test_checkout_in_directory(self):
         self.run_script("""
 $ bzr colo-init
-$ bzr colo-clone tree
+$ bzr colo-checkout tree
 $ cd tree
 $ cat .bzr/README
 $ bzr nick
@@ -694,12 +694,12 @@
   trunk
 """)
 
-    def test_clone(self):
+    def test_checkout(self):
         self.run_script("""
 $ bzr colo-init test
 $ cd test
 $ bzr colo-branch a/b
-$ bzr colo-clone ../b-checkout
+$ bzr colo-checkout ../b-checkout
 $ cd ../b-checkout
 $ bzr switch colo:trunk
 """)

=== modified file 'tutorial.py'
--- tutorial.py	2010-01-14 12:55:12 +0000
+++ tutorial.py	2010-02-06 14:09:14 +0000
@@ -116,7 +116,7 @@
 
 Sometimes it is nice to be able to make a second working tree for the same
 colocated workspace, for example to work on a second bug fix in parallel.
-This plugin provides the ``colo-clone`` command which creates a second
+This plugin provides the ``colo-checkout`` command which creates a second
 checkout of the current branch in the specified directory.  Often, the
 specified directory will be a sibling of the current workspace.  For example::
 
@@ -124,7 +124,7 @@
       fix-eol-bug
     * trunk
     $ bzr colo-branch fix-unicode-normalization # creates a colocated branch
-    $ bzr colo-clone ../fix-unicode-normalization
+    $ bzr colo-checkout ../fix-unicode-normalization
     $ cd ../fix-unicode-normalization
     $ bzr colo-branches
       fix-eol-bug
@@ -140,13 +140,13 @@
     $ bzr diff --old=colo:trunk
 
 Since creating a new colocated branch for work in a new checkout is a common
-operation, the ``colo-clone`` command takes a ``--create`` option to indicate
-that a new colocated branch should be created and then the new checkout should
-be switched to that new branch.  The name of the new branch comes from the
-basename of the directory that is being created.  For example, we could
-shorten the above example as::
+operation, the ``colo-checkout`` command takes a ``--create`` option
+to indicate that a new colocated branch should be created and then the new
+checkout should be switched to that new branch.  The name of the new branch
+comes from the basename of the directory that is being created.
+For example, we could shorten the above example as::
 
-    $ bzr colo-clone --create ../fix-unicode-normalization
+    $ bzr colo-checkout --create ../fix-unicode-normalization
 
 Fetching an Existing Project
 ----------------------------
@@ -309,7 +309,7 @@
 re-create.  This can be a disadvantage when we want to have two separate
 working trees, for example to compare two sets of files or to maintain a
 working tree that is up to date with a particular branch.  We can do this
-using a colocated workspace and the ``colo-clone`` command.
+using a colocated workspace and the ``colo-checkout`` command.
 
 For example, when developing a project such as Bazaar, it can be important to
 have a pristine copy of the trunk from which to run Bazaar while developing so
@@ -320,7 +320,7 @@
 
     $ bzr colo-fetch lp:bzr bzr
     $ cd bzr
-    $ bzr colo-clone ../bzr.dev
+    $ bzr colo-checkout ../bzr.dev
     $ bzr colo-branch fix-doc-bugs
     $ bzr colo-branches
     * fix-doc-bugs
@@ -328,8 +328,8 @@
     $ ../bzr.dev/bzr --version  # this runs the trunk version of bzr
     $ ./bzr --version  # this runs the version in the fix-doc-bugs branch
 
-Another use for the ``colo-clone`` command is to create a second working tree
-to do some work without interrupting the work that is happening in the
+Another use for the ``colo-checkout`` command is to create a second working
+tree to do some work without interrupting the work that is happening in the
 colocated workspace (although a judicious use of ``bzr shelve`` can sometimes
 make this unnecessary).  Here is an example that uses the ``--create`` option
 to create a new branch and make a new checkout of it::
@@ -337,7 +337,7 @@
     $ bzr colo-branches
     * fix-doc-bugs
       trunk
-    $ bzr colo-clone --create ../urgent-fix
+    $ bzr colo-checkout --create ../urgent-fix
     $ bzr colo-branches
     * fix-doc-bugs
       trunk