[RFC]combine find_ids_across_trees and tree._iter_changes

Robert Collins robertc at robertcollins.net
Thu Feb 22 03:36:45 GMT 2007


On Wed, 2007-02-21 at 22:15 -0500, Aaron Bentley wrote:
> Robert Collins wrote:
> > Aaron, for dirstate, we can do single-pass diff generation straight from
> > file paths - correctly - without needing a call to
> > find_ids_across_trees: I've got a dirstate tuned version of that call,
> > but rather than change the api to return paths and ids, I'd like to just
> > avoid invoking it at all - in the common case it just gathers all the
> > ids from all trees, which isn't very helpful at all as we end up
> > considering all ids anyway.
> > 
> > Is this ok with you ? If not do you have a proposed alternative ?
> 
> I'm fine with providing a combined call, but leaving the existing
> functionality in place.  If you want to remove the existing
> functionality, my main objection is that it prevents us from doing more
> precise selection, and from using uninvolved trees for finding ids.  For
> example, doing "bzr diff -r 5..6 foo.py" will match a file that is named
> "foo.py" in the current tree, even if it was not named that in revision
> 5 or 6.

I'll certainly provide that functionality. We need to use it more as it
happens - there is a bug in status on a merged tree where a path in the
merged parent is not considered for file_id selection. I just want to
remove the double handling in these code paths.

-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/20070222/b898b19b/attachment.pgp 


More information about the bazaar mailing list