Merge lp:~spiv/bzr/remove-tree-multi-253137 into lp:bzr

[Andrew Bennetts]

[Andrew Bennetts (spiv)]

This fairly simple patch extends remove-tree to be able to remove multiple trees at once. The patch is mainly the work of Jared Hance, I just fixed a simple bug in the original patch and added a test.

Special thanks to Martin for noticing that I had unlanded work here.

[Andrew Bennetts (spiv)]

(Btw, according to LP team membership, Jared has signed the Canonical Contributors Agreement)

[Ian Clatworthy (ian-clatworthy)]

review: Approve

[John A Meinel (jameinel)]

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

Andrew Bennetts wrote:
> Andrew Bennetts has proposed merging lp:~spiv/bzr/remove-tree-multi-253137 into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #253137 remove-tree should be able to operate on multiple branches at once
> https://bugs.launchpad.net/bugs/253137
>
>
> This fairly simple patch extends remove-tree to be able to remove multiple trees at once. The patch is mainly the work of Jared Hance, I just fixed a simple bug in the original patch and added a test.
>
> Special thanks to Martin for noticing that I had unlanded work here.
>

I'm late to this, but:

+ try:
+ working = d.open_workingtree()
+ except errors.NoWorkingTree:
+ raise errors.BzrCommandError("No working tree to remove")
+ except errors.NotLocalUrl:
+ raise errors.BzrCommandError("You cannot remove the
working tree"
+ " of a remote path")

This isn't very helpful if you are supplying multiple paths. Which one
doesn't have a working tree? (And should we fail all following ones
because 1 of them didn't have a tree?)

Anyway, you don't have to fix it now, I filed:
https://bugs.edge.launchpad.net/bzr/+bug/521005

To keep track of it.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkt1aXkACgkQJdeBCYSNAAOqaQCfeGVXw+nNK9d8ccCEBHDBu2aA
ilMAoISIJ6YvW3b61nQkYezyQmCKjM1u
=+MLO
-----END PGP SIGNATURE-----

[Andrew Bennetts (spiv)]

John A Meinel wrote:
[...]
> This isn't very helpful if you are supplying multiple paths. Which one
> doesn't have a working tree? (And should we fail all following ones
> because 1 of them didn't have a tree?)
>
> Anyway, you don't have to fix it now, I filed:
> https://bugs.edge.launchpad.net/bzr/+bug/521005
>
> To keep track of it.

Good catch. Thanks for the bug report!

-Andrew.

=== modified file 'NEWS'
--- NEWS	2010-02-11 11:48:55 +0000
+++ NEWS	2010-02-12 04:38:13 +0000
@@ -59,6 +59,9 @@
 * ``bzr add`` will not add conflict related files unless explicitly required.
   (Vincent Ladeuil, #322767, #414589)
 
+* ``bzr remove-tree`` can now remove multiple working trees.
+  (Jared Hance, Andrew Bennetts, #253137)
+
 * Network transfer amounts and rates are now displayed in SI units according
   to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
   (Gordon Tyler, #514399)

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2010-02-11 09:27:55 +0000
+++ bzrlib/builtins.py	2010-02-12 04:38:13 +0000
@@ -453,34 +453,38 @@
     To re-create the working tree, use "bzr checkout".
     """
     _see_also = ['checkout', 'working-trees']
-    takes_args = ['location?']
+    takes_args = ['location*']
     takes_options = [
         Option('force',
                help='Remove the working tree even if it has '
                     'uncommitted changes.'),
         ]
 
-    def run(self, location='.', force=False):
-        d = bzrdir.BzrDir.open(location)
-
-        try:
-            working = d.open_workingtree()
-        except errors.NoWorkingTree:
-            raise errors.BzrCommandError("No working tree to remove")
-        except errors.NotLocalUrl:
-            raise errors.BzrCommandError("You cannot remove the working tree"
-                                         " of a remote path")
-        if not force:
-            if (working.has_changes()):
-                raise errors.UncommittedChanges(working)
-
-        working_path = working.bzrdir.root_transport.base
-        branch_path = working.branch.bzrdir.root_transport.base
-        if working_path != branch_path:
-            raise errors.BzrCommandError("You cannot remove the working tree"
-                                         " from a lightweight checkout")
-
-        d.destroy_workingtree()
+    def run(self, location_list, force=False):
+        if not location_list:
+            location_list=['.']
+
+        for location in location_list:
+            d = bzrdir.BzrDir.open(location)
+            
+            try:
+                working = d.open_workingtree()
+            except errors.NoWorkingTree:
+                raise errors.BzrCommandError("No working tree to remove")
+            except errors.NotLocalUrl:
+                raise errors.BzrCommandError("You cannot remove the working tree"
+                                             " of a remote path")
+            if not force:
+                if (working.has_changes()):
+                    raise errors.UncommittedChanges(working)
+
+            working_path = working.bzrdir.root_transport.base
+            branch_path = working.branch.bzrdir.root_transport.base
+            if working_path != branch_path:
+                raise errors.BzrCommandError("You cannot remove the working tree"
+                                             " from a lightweight checkout")
+
+            d.destroy_workingtree()
 
 
 class cmd_revno(Command):

=== modified file 'bzrlib/tests/blackbox/test_remove_tree.py'
--- bzrlib/tests/blackbox/test_remove_tree.py	2009-09-08 16:45:11 +0000
+++ bzrlib/tests/blackbox/test_remove_tree.py	2010-02-12 04:38:13 +0000
@@ -43,6 +43,12 @@
         self.run_bzr('remove-tree branch1')
         self.failIfExists('branch1/foo')
 
+    def test_remove_tree_multiple_branch_explicit(self):
+        self.tree.bzrdir.sprout('branch2')
+        self.run_bzr('remove-tree branch1 branch2')
+        self.failIfExists('branch1/foo')
+        self.failIfExists('branch2/foo')
+
     def test_remove_tree_sprouted_branch(self):
         self.tree.bzrdir.sprout('branch2')
         self.failUnlessExists('branch2/foo')