[MERGE][#157026] Fall back to showing e-mail in ``log --short/--line`` if the committer/author has only e-mail

[Aaron Bentley]

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

Lukáš Lalinský wrote:

>> This ought to be using email.Utils.parseaddr.  I think we didn't know 
>> about it when we wrote these originally.
> 
> The problem is that it doesn't really do what LogFormatter.short_author
> needs:
> 
> In [2]: email.Utils.parseaddr('John Smith')
> Out[2]: ('', 'John')

Well, the nice thing about parseaddr is it handles different forms of
address.  This behavior's probably due to that.

> I don't know whether it's a bug or a feature, but either way it doesn't
> work for us.

Agreed.  I'll re-review.

>> Also, I'd prefer if you didn't use "or" and "and" as ways of selecting 
>> values.  It's not a very clear way of writing it.
> 
> I personally find "or" clear enough when selecting from the first
> non-empty of two values, but I can change it if decide about the first
> issue.

I wouldn't ask you to re-submit just for that.  But if you could avoid
it in the future, that would be nice.

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

iD8DBQFHUrYQ0F+nu1YWqI0RAnvJAJ9YoGs5lBZHkwceytOj31AcvfD9swCfaufa
vA970sOVwpkdH1RuKw8+WZ4=
=It/G
-----END PGP SIGNATURE-----