Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/hg.py @ 55:2add70d51441
From: Thomas Arendsen Hein <thomas@intevation.de>
Good. Attached is a patch which also tries to use $EMAIL as the
commit user and removed a try/except by using os.environ.get.
author | mpm@selenic.com |
---|---|
date | Wed, 11 May 2005 14:38:26 -0800 |
parents | 9f64181ff9a9 |
children | ad2ea1185f04 |
comparison
equal
deleted
inserted
replaced
54:b24731008221 | 55:2add70d51441 |
---|---|
122 | 122 |
123 def read(self, node): | 123 def read(self, node): |
124 return self.extract(self.revision(node)) | 124 return self.extract(self.revision(node)) |
125 | 125 |
126 def add(self, manifest, list, desc, transaction, p1=None, p2=None): | 126 def add(self, manifest, list, desc, transaction, p1=None, p2=None): |
127 try: user = os.environ["HGUSER"] | 127 user = (os.environ.get("HGUSER") or |
128 except: user = os.environ["LOGNAME"] + '@' + socket.getfqdn() | 128 os.environ.get("EMAIL") or |
129 os.environ.get("LOGNAME", "unknown") + '@' + socket.getfqdn()) | |
129 date = "%d %d" % (time.time(), time.timezone) | 130 date = "%d %d" % (time.time(), time.timezone) |
130 list.sort() | 131 list.sort() |
131 l = [hex(manifest), user, date] + list + ["", desc] | 132 l = [hex(manifest), user, date] + list + ["", desc] |
132 text = "\n".join(l) | 133 text = "\n".join(l) |
133 return self.addrevision(text, transaction, self.count(), p1, p2) | 134 return self.addrevision(text, transaction, self.count(), p1, p2) |