[MERGE] Two little fixes/cleanups

[Michael Ellerman]

On Sat, 10 Dec 2005 08:47, Wouter van Heyst wrote:
> On Fri, Dec 09, 2005 at 12:20:36AM -0600, Michael Ellerman wrote:
> >  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.

Yeah I fixed that up yesterday.

> >  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."

Hmm, ok :) I guess it seperates it a bit more visually.

> >  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

You don't? I hit this when one of my old plugins skewed with bzr such that the 
option it wanted wasn't there anymore - it took me a couple of minutes to 
work that out though. Having the message at least tell me it was looking for 
an option would have helped I think.

I've ripped out that last patch and update the other two, so it's now:

 1475 Michael Ellerman  2005-12-10
      Raise NoSuchFile when someone tries to add a non-existant file.

 1474 Michael Ellerman  2005-12-10
      Simplify handling of DivergedBranches in cmd_pull()


cheers

-- 
Michael Ellerman
IBM OzLabs

email: michael:ellerman.id.au
inmsg: mpe:jabber.org
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051210/5737da98/attachment.pgp