[MERGE] bzr rm improvements

[Robert Collins]

On Wed, 2008-08-13 at 09:24 -0500, John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1


> +            elif file_list is None:
> +                # missing files show up in iter_changes(basis) as
> +                # versioned-with-no-kind.
> +                missing = []
> +                for change in tree.iter_changes(tree.basis_tree()):
> +                    if change[6][1] is None:
> +                        missing.append(change[1][1])
> +                file_list = sorted(missing, reverse=True)
> +                file_deletion_strategy = 'keep'
> 
> ^- Wouldn't already removed files also show up as change[6][1] is None ?

An actual removal shows up with that yes, I'll tweak it to check the
entry is in the tree too.

> With your patch doing
> 
> $ bzr rm man1
> $ bzr rm
> I get a traceback on:
> bzr: ERROR: exceptions.TypeError: 'NoneType' object is unsubscriptable
> 
> But I wonder if that is just a problem on Win32.

Nope,
AttributeError: 'NoneType' object has no attribute 'startswith'

Fixing...

> Anyway, we need to add a test that having files already removed in the
> tree doesn't abort.

Thanks for catching this.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080815/7df28f0b/attachment.pgp