[PATCH] Handle 'name firstname <email@server>' correctly in annotate

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

[PATCH] Handle 'name firstname <email@server>' correctly in annotate

- From [e-mail]

manifest hash: 8af8d6b2afd8caf8e48e5150b91410dea730d41a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCxCpzywK+sNU5EO8RAj8tAJ9lIXS7tlgonp6B810QahCZM0NsigCdH8xQ
cRhEGvrKDrTgc4AY9guylDU=
=+sWJ
-----END PGP SIGNATURE-----

mercurial/commands.py

@@ -232,6 +232,9 b' def annotate(u, repo, file, *files, **op'
             f = name.find('@')
             if f >= 0:
                 name = name[:f]
+            f = name.find('<')
+            if f >= 0:
+                name = name[f+1:]
             bcache[rev] = name
             return name
 

mercurial/hgweb.py

@@ -432,6 +432,9 b' class hgweb:'
                     f = name.find('@')
                     if f >= 0:
                         name = name[:f]
+                    f = name.find('<')
+                    if f >= 0:
+                        name = name[f+1:]
                     bcache[r] = name
 
                 if last != cnode: