[MERGE][0.15] _iter_changes returns Unicode paths

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> On Fri, 2007-03-16 at 10:05 -0500, John Arbash Meinel wrote:
>> What I would really like to see is us inverting our layering, as you
>> have mentioned. So that we have an _iter_3_trees (I'm calling it 3
>> because you have the disk and two versioned trees), and then
>> _process_entry becomes the point of actually yielding the data back to
>> the caller. I think will end up with a lot fewer if/else statements
>> that
>> essentially do the same thing.
>>
>> I think a change like that can wait until 0.16. So I was thinking to
>> do
>> this "simple" fix for 0.15, and then clean it up for 0.16. 
> 
> Right. I'm working on that fixed layering in dirstate2, with the first
> step being iter_dirs_from_paths_in_trees(because you might want one
> versioned tree, or all three in a merged dirstate, or something in
> between).
> 
> Rob

Actually, I found we were already handling the "or_none" case, and just
cleaned up the code to make it more obvious that we were doing that.

Of course, in testing it on my Mac, I found the other Unicode
Normalization bug rearing its ugly head.

If you want, you can review the new (attached) patch.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF+vuoJdeBCYSNAAMRApg2AKDTR8doBAXBR1gsoODYjIGaKfqxOQCgyVGK
cPLehGCu/UzOQQJ7KojVMXc=
=uzoN
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: iter_changes_unicode_unknowns.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070316/6c9a7a66/attachment-0001.diff