Move generating short username to display in hg/hgweb annotate to ui module.

mercurial/commands.py

@@ -472,14 +472,7 b' def annotate(ui, repo, *pats, **opts):'
             return bcache[rev]
         except KeyError:
             cl = repo.changelog.read(repo.changelog.node(rev))
-            name = cl[1]
-            f = name.find('@')
-            if f >= 0:
-                name = name[:f]
-            f = name.find('<')
-            if f >= 0:
-                name = name[f+1:]
-            bcache[rev] = name
+            bcache[rev] = name = ui.shortuser(cl[1])
             return name
 
     if not pats:

mercurial/hgweb.py

@@ -507,14 +507,7 b' class hgweb:'
                     name = bcache[r]
                 except KeyError:
                     cl = self.repo.changelog.read(cnode)
-                    name = cl[1]
-                    f = name.find('@')
-                    if f >= 0:
-                        name = name[:f]
-                    f = name.find('<')
-                    if f >= 0:
-                        name = name[f+1:]
-                    bcache[r] = name
+                    bcache[r] = name = self.repo.ui.shortuser(cl[1])
 
                 if last != cnode:
                     parity = 1 - parity

mercurial/ui.py

@@ -78,6 +78,16 b' class ui:'
                                 os.environ.get("USERNAME", "unknown"))
                  + '@' + socket.getfqdn()))
 
+    def shortuser(self, user):
+        """Return a short representation of a user name or email address."""
+        f = user.find('@')
+        if f >= 0:
+            user = user[:f]
+        f = user.find('<')
+        if f >= 0:
+            user = user[f+1:]
+        return user
+
     def expandpath(self, loc):
         paths = {}
         for name, path in self.configitems("paths"):