Merge lp:~vila/bzr-loom/595563-switch-directory into lp:bzr-loom

[Vincent Ladeuil]

Since bzr-loom now requires 2.2.x, I think this is uncontroversial.
And it fixes the test failure :)

[lp:~vila/bzr-loom/595563-switch-directory]

115. By Vincent Ladeuil on 2010-06-17

Bah, missed the obvious, no test for that though :-/

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr-loom/595563-switch-directory into lp:bzr-loom.
>
> Requested reviews:
> Loom Developers (bzr-loom-devs)
> Related bugs:
> #595563 faling test: TypeError: run() got an unexpected keyword argument 'directory'
> https://bugs.launchpad.net/bugs/595563
>
>
> Since bzr-loom now requires 2.2.x, I think this is uncontroversial.
> And it fixes the test failure :)
>
>

You didn't add 'directory' as one of the options to the command. Don't
you need to do so, as well as adding the argument?

 review: needsfixing
 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkwaV64ACgkQJdeBCYSNAAPOEwCeOpvzQBaUW6AhP6G6JwfDGdVB
X4AAn1gwSzh5QVTSd+gf/fv6DiMpHtgy
=HK2j
-----END PGP SIGNATURE-----

review: Needs Fixing

[Robert Collins (lifeless)]

No, because loom decorates switch it inherits all the built in options.

=== modified file 'NEWS'
--- NEWS	2010-06-16 03:37:23 +0000
+++ NEWS	2010-06-17 16:19:23 +0000
@@ -30,6 +30,10 @@
 BUGFIXES
 --------
 
+* ``switch`` now accept the optional --directory argument.
+  (Vincent Ladeuil, #595563)
+
+
 API BREAKS
 ----------
 

=== modified file 'commands.py'
--- commands.py	2010-06-16 03:37:23 +0000
+++ commands.py	2010-06-17 16:19:23 +0000
@@ -202,10 +202,13 @@
             return thread[0]
         return to_location
 
-    def run(self, to_location=None, force=False, create_branch=False, revision=None):
+    def run(self, to_location=None, force=False, create_branch=False,
+            revision=None, directory=None):
         # The top of this is cribbed from bzr; because bzr isn't factored out
         # enough.
-        control_dir, path = bzrdir.BzrDir.open_containing('.')
+        if directory is None:
+            directory = u'.'
+        control_dir, path = bzrdir.BzrDir.open_containing(directory)
         if to_location is None:
             if revision is None:
                 raise errors.BzrCommandError(
@@ -223,7 +226,7 @@
                 to_location)
         if from_branch is not None:
             # Note: reopens.
-            (tree, path) = workingtree.WorkingTree.open_containing('.')
+            (tree, path) = workingtree.WorkingTree.open_containing(directory)
             tree = LoomTreeDecorator(tree)
             try:
                 if create_branch: