equal
deleted
inserted
replaced
42 if self.cdata.has_section(section): |
42 if self.cdata.has_section(section): |
43 return self.cdata.items(section) |
43 return self.cdata.items(section) |
44 return [] |
44 return [] |
45 |
45 |
46 def username(self): |
46 def username(self): |
47 return (self.config("ui", "username") or |
47 return (os.environ.get("HGUSER") or |
48 os.environ.get("HGUSER") or |
48 self.config("ui", "username") or |
49 os.environ.get("EMAIL") or |
49 os.environ.get("EMAIL") or |
50 (os.environ.get("LOGNAME", |
50 (os.environ.get("LOGNAME", |
51 os.environ.get("USERNAME", "unknown")) |
51 os.environ.get("USERNAME", "unknown")) |
52 + '@' + socket.getfqdn())) |
52 + '@' + socket.getfqdn())) |
53 |
53 |
91 (fd, name) = tempfile.mkstemp("hg") |
91 (fd, name) = tempfile.mkstemp("hg") |
92 f = os.fdopen(fd, "w") |
92 f = os.fdopen(fd, "w") |
93 f.write(text) |
93 f.write(text) |
94 f.close() |
94 f.close() |
95 |
95 |
96 editor = (self.config("ui", "editor") or |
96 editor = (os.environ.get("HGEDITOR") or |
97 os.environ.get("HGEDITOR") or |
97 self.config("ui", "editor") or |
98 os.environ.get("EDITOR", "vi")) |
98 os.environ.get("EDITOR", "vi")) |
99 |
99 |
100 os.environ["HGUSER"] = self.username() |
100 os.environ["HGUSER"] = self.username() |
101 util.system("%s %s" % (editor, name), errprefix = "edit failed") |
101 util.system("%s %s" % (editor, name), errprefix = "edit failed") |
102 |
102 |