equal
deleted
inserted
replaced
195 user = self.config("ui", "username") |
195 user = self.config("ui", "username") |
196 if user is None: |
196 if user is None: |
197 user = os.environ.get("EMAIL") |
197 user = os.environ.get("EMAIL") |
198 if user is None: |
198 if user is None: |
199 try: |
199 try: |
200 user = '%s@%s' % (getpass.getuser(), socket.getfqdn()) |
200 user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
201 except KeyError: |
201 except KeyError: |
202 raise util.Abort(_("Please specify a username.")) |
202 raise util.Abort(_("Please specify a username.")) |
203 return user |
203 return user |
204 |
204 |
205 def shortuser(self, user): |
205 def shortuser(self, user): |