[MERGE] Three little fixes/cleanups

[Wouter van Heyst]

On Fri, Dec 09, 2005 at 12:20:36AM -0600, Michael Ellerman wrote:
> Hey Bzristas,
> 
> Just three little fixes/cleanups.
> 
> http://michael.ellerman.id.au/files/bzr/fixes
> 
>  1476 Michael Ellerman  2005-12-08
>       Raise NoSuchFile when someone tries to add a non-existant file.

in bzrlib/add.py I would compare with errno.ENOENT instead of 2, +1
otherwise.

>  1475 Michael Ellerman  2005-12-08
>       Simplify handling of DivergedBranches in cmd_pull()

I slightly prefer the old formatting with double instead of a single space:

    "These branches have diverged.  Try merge."

+0.

> 
>  1474 Michael Ellerman  2005-12-08
>       Catch bad options nicely.

I don't think this is an improvement as is. Adding 'changeset' to
cmd_cat's takes_options:

    bzr.mpe.fixes> ./bzr cat             
    bzr: ERROR: Internal check failed: Unknown option "changeset"

and 

    bzr.dev> ./bzr cat             
    bzr: ERROR: exceptions.KeyError: 'changeset'
      at /home/larstiq/src/bzr.dev/bzrlib/commands.py line 207
      in options

So -0 for now.

Wouter van Heyst