diff -r 1cc5f25653a3 -r e4abeafd6eb1 mercurial/ui.py
--- a/mercurial/ui.py	Mon Feb 27 11:18:56 2006 -0800
+++ b/mercurial/ui.py	Mon Feb 27 11:32:10 2006 -0800
@@ -104,13 +104,7 @@
 
     def shortuser(self, user):
         """Return a short representation of a user name or email address."""
-        if not self.verbose:
-            f = user.find('@')
-            if f >= 0:
-                user = user[:f]
-            f = user.find('<')
-            if f >= 0:
-                user = user[f+1:]
+        if not self.verbose: user = util.shortuser(user)
         return user
 
     def expandpath(self, loc, root=""):