[MERGE] Only loop graph.iter_ancestry once when running "bzr log FILE"

Robert Collins robertc at robertcollins.net
Tue Sep 9 01:05:46 BST 2008


On Mon, 2008-09-08 at 01:13 +0200, Gary van der Merwe wrote:
> === modified file 'bzrlib/commands.py'
> --- bzrlib/commands.py  2008-08-31 19:39:01 +0000
> +++ bzrlib/commands.py  2008-09-07 22:44:20 +0000
> @@ -845,7 +845,7 @@
>      except UnicodeDecodeError:
>          raise errors.BzrError(("Parameter '%r' is unsupported by the
> current "
> 
> "encoding." % a))
> -    ret = run_bzr_catch_errors(argv)
> +    ret = run_bzr_catch_user_errors(argv)
>      trace.mutter("return code %d", ret)
>      return ret
>  

I'm pretty sure this hunk is undesired.

Other than that:
I need to look at this in full context to be sure its ok. The thing I
will be looking for is - 'do we walk the graph when we do not need
to' (that is, if for some log options, like --short, we go from
not-reading-the-graph to reading-the-graph, then this is a problem0.

For now, I can't approve or decline, though the code changes look ok up
front.

bb:comment
-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/20080909/c39c34c4/attachment.pgp 


More information about the bazaar mailing list