Move generating short username to display in hg/hgweb annotate to ui module.
--- a/mercurial/commands.py Sun Aug 28 16:41:16 2005 +0200
+++ b/mercurial/commands.py Sun Aug 28 17:29:28 2005 +0200
@@ -472,14 +472,7 @@
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:
--- a/mercurial/hgweb.py Sun Aug 28 16:41:16 2005 +0200
+++ b/mercurial/hgweb.py Sun Aug 28 17:29:28 2005 +0200
@@ -507,14 +507,7 @@
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
--- a/mercurial/ui.py Sun Aug 28 16:41:16 2005 +0200
+++ b/mercurial/ui.py Sun Aug 28 17:29:28 2005 +0200
@@ -78,6 +78,16 @@
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"):