equal
deleted
inserted
replaced
264 ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname". |
264 ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname". |
265 """ |
265 """ |
266 user = os.environ.get("HGUSER") |
266 user = os.environ.get("HGUSER") |
267 if user is None: |
267 if user is None: |
268 user = self.config("ui", "username") |
268 user = self.config("ui", "username") |
|
269 if user is not None: |
|
270 user = os.path.expandvars(user) |
269 if user is None: |
271 if user is None: |
270 user = os.environ.get("EMAIL") |
272 user = os.environ.get("EMAIL") |
271 if user is None and self.configbool("ui", "askusername"): |
273 if user is None and self.configbool("ui", "askusername"): |
272 user = self.prompt(_("enter a commit username:"), default=None) |
274 user = self.prompt(_("enter a commit username:"), default=None) |
273 if user is None and not self.interactive(): |
275 if user is None and not self.interactive(): |