Merge lp:~mgiuca/bzr/remove-tree-shelved into lp:bzr

[Matt Giuca]

remove-tree now refuses to run without --force if there are shelved changes. (#586639)

remove-tree now refuses to run without --force if there are shelved changes. (#586639)
Added two new test cases (./bzr selftest remove-tree).

[Alexander Belchenko (bialix)]

Looks good for me.

review: Approve

[Robert Collins (lifeless)]

+1 from me too

[Martin Pool (mbp)]

Needs news; that can be added during merging.

Thanks for fixing this, Matt.

Can you please execute the copyright agreement <http://www.canonical.com/contributors> so we can merge this?

review: Approve

[Martin Pool (mbp)]

On 31 May 2010 13:42, Martin Pool <email address hidden> wrote:
> Review: Approve
> Needs news; that can be added during merging.
>
> Thanks for fixing this, Matt.
>
> Can you please execute the copyright agreement <http://www.canonical.com/contributors> so we can merge this?

wgrant tells me the link is broken; I've put a copy of the agreement
here: http://sourcefrog.net/tmp/1y/Canonical%20Contributor%20Agreement,%20ver%202.5.pdf

--
Martin <http://launchpad.net/~mbp/>

[Matt Giuca (mgiuca)]

Cheers, Martin. I've emailed the acceptance of the Agreement to you. Thanks to the Bazaar team for a very fast response.

[Martin Pool (mbp)]

sent to pqm by email

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2010-05-25 17:27:52 +0000
+++ bzrlib/builtins.py	2010-05-28 07:28:31 +0000
@@ -491,7 +491,7 @@
     takes_options = [
         Option('force',
                help='Remove the working tree even if it has '
-                    'uncommitted changes.'),
+                    'uncommitted or shelved changes.'),
         ]
 
     def run(self, location_list, force=False):
@@ -511,6 +511,8 @@
             if not force:
                 if (working.has_changes()):
                     raise errors.UncommittedChanges(working)
+                if working.get_shelf_manager().last_shelf() is not None:
+                    raise errors.ShelvedChanges(working)
 
             if working.user_url != working.branch.user_url:
                 raise errors.BzrCommandError("You cannot remove the working tree"

=== modified file 'bzrlib/errors.py'
--- bzrlib/errors.py	2010-05-13 17:32:55 +0000
+++ bzrlib/errors.py	2010-05-28 07:28:31 +0000
@@ -2850,6 +2850,12 @@
         BzrError.__init__(self, tree=tree, display_url=display_url, more=more)
 
 
+class ShelvedChanges(UncommittedChanges):
+
+    _fmt = ('Working tree "%(display_url)s" has shelved changes'
+            ' (See bzr shelve --list).%(more)s')
+
+
 class MissingTemplateVariable(BzrError):
 
     _fmt = 'Variable {%(name)s} is not available.'

=== modified file 'bzrlib/tests/blackbox/test_remove_tree.py'
--- bzrlib/tests/blackbox/test_remove_tree.py	2009-11-16 05:57:00 +0000
+++ bzrlib/tests/blackbox/test_remove_tree.py	2010-05-28 07:28:31 +0000
@@ -19,6 +19,7 @@
 
 import os
 
+from bzrlib import shelf
 from bzrlib.tests.blackbox import ExternalBase
 
 
@@ -155,3 +156,22 @@
         self.run_bzr('remove-tree branch2 --force')
         self.failIfExists('branch2/foo')
         self.failIfExists('branch2/bar')
+
+    def test_remove_tree_shelved_changes(self):
+        # https://bugs.launchpad.net/bzr/+bug/586639
+        tree = self.make_branch_and_tree('.')
+        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
+        self.addCleanup(creator.finalize)
+        shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
+        output = self.run_bzr_error(["Working tree .* has shelved changes"],
+                                    'remove-tree', retcode=3)
+
+    def test_remove_tree_shelved_changes_force(self):
+        tree = self.make_branch_and_tree('.')
+        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
+        self.addCleanup(creator.finalize)
+        shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
+        self.run_bzr('remove-tree --force')
+        self.run_bzr('checkout')
+        # Ensure shelf is empty
+        self.assertIs(None, tree.get_shelf_manager().last_shelf())