[MERGE] Diff now emits files in alphabetical order

Aaron Bentley aaron.bentley at utoronto.ca
Tue Dec 18 05:09:02 GMT 2007


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

Andrew Bennetts wrote:
> Aaron Bentley wrote:
> In some ways I think I actually prefer the current order.  Perhaps it's just
> that I'm used to it, but for instance having deleted files at the end of the
> diff means I know I can ignore the detail of the diff from that point on,
> because I know that it will consist of just deleting lines.

When I originally proposed this change, Mathew Fuller said he thought it
was "quirky".  Personally, I think it looks funny, and makes it hard to
find files in a big diff.

You might like "added" at the top and "deleted" at the bottom, but does
it really make any sense to separate modified and renamed+modified files?

> Ideally, for bzr development at least, I'd like to see diff emit files in this
> order:
> 
>   - doc/*
>   - bzrlib/tests/*
>   - everything else

Care to define that sort order? ;-)
> Of course, this change isn't really any better or worse in that respect
> (although I guess it will tend to put doc/ first),

It should put bzrlib first.

> so personally I'm neutral on
> changing from grouped by changed kind to alphabetical by name.  I guess there's
> been some user interest in alphabetical ordering?

Well, not a groundswell, by any means.  I also think that using
iter_changes is better because simplifies the code and gives you access
to better-quality change data.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHZ1Xu0F+nu1YWqI0RAn08AJ4jApqeU2S0stfJNyQtuupl9iCpwQCfbepr
QWVlEuoTQ0p0Zr0+Q92ARFc=
=4ENc
-----END PGP SIGNATURE-----



More information about the bazaar mailing list