equal
deleted
inserted
replaced
177 user = self.config("ui", "username") |
177 user = self.config("ui", "username") |
178 if user is None: |
178 if user is None: |
179 user = os.environ.get("EMAIL") |
179 user = os.environ.get("EMAIL") |
180 if user is None and self.configbool("ui", "askusername"): |
180 if user is None and self.configbool("ui", "askusername"): |
181 user = self.prompt(_("enter a commit username:"), default=None) |
181 user = self.prompt(_("enter a commit username:"), default=None) |
182 if user is None: |
182 if user is None and not self.interactive(): |
183 try: |
183 try: |
184 user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
184 user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
185 self.warn(_("No username found, using '%s' instead\n") % user) |
185 self.warn(_("No username found, using '%s' instead\n") % user) |
186 except KeyError: |
186 except KeyError: |
187 pass |
187 pass |