[MERGE] add shelve --destroy

[James Westby]

On Thu, 2009-03-12 at 11:26 +1000, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi all,
> 
> This patch adds the option of destructive shelving, by doing shelve
> - --destroy.  This is equivalent to bzr shelve && bzr unshelve --delete.
> This was requested by an old colleague of mine (Hi Maru!).
> 
> Obviously, there's potential for foot-shooting, but I hope that the
> option name is sufficiently scary that people using it will understand
> the risk.

What do you think about making this "revert --interactive"? I realise it
would be more plumbing, but to me it is closer to the meaning, and
moving it to "revert" would make it clearer that changes were being
destroyed?

> +                    if self.destroy:
> +                        creator.transform()
> +                    else:
> +                        shelf_id =
> self.manager.shelve_changes(creator,
> +
> self.message)
> +                        trace.note('Changes shelved with id "%d".' %
> shelf_id)

Should there be a trace.note on the destroy case as well?

>                  if (self.auto_apply or self.prompt_bool(
>                      'Shelve %d change(s)?' % changes_shelved)):

Should the messages be changed for --destroy? I would say yes if it
was "revert --interactive", here I'm not so sure, "Destroy %d change(s)"
would be pretty clear I think.

Thanks,

James