Show More
@@ -1498,8 +1498,8 b' class localrepository:' | |||
|
1498 | 1498 | self.ui.debug("file %s: other %s ancestor %s\n" % |
|
1499 | 1499 | (fn, short(other), short(base))) |
|
1500 | 1500 | |
|
1501 |
cmd = s |
|
|
1502 |
|
|
|
1501 | cmd = os.environ.get("HGMERGE", "hgmerge") or \ | |
|
1502 | self.ui.config("ui", "merge") | |
|
1503 | 1503 | r = os.system("%s %s %s %s" % (cmd, a, b, c)) |
|
1504 | 1504 | if r: |
|
1505 | 1505 | self.ui.warn("merging %s failed!\n" % fn) |
@@ -44,8 +44,8 b' class ui:' | |||
|
44 | 44 | return [] |
|
45 | 45 | |
|
46 | 46 | def username(self): |
|
47 |
return (s |
|
|
48 |
|
|
|
47 | return (os.environ.get("HGUSER") or | |
|
48 | self.config("ui", "username") or | |
|
49 | 49 | os.environ.get("EMAIL") or |
|
50 | 50 | (os.environ.get("LOGNAME", |
|
51 | 51 | os.environ.get("USERNAME", "unknown")) |
@@ -93,8 +93,8 b' class ui:' | |||
|
93 | 93 | f.write(text) |
|
94 | 94 | f.close() |
|
95 | 95 | |
|
96 |
editor = (s |
|
|
97 |
|
|
|
96 | editor = (os.environ.get("HGEDITOR") or | |
|
97 | self.config("ui", "editor") or | |
|
98 | 98 | os.environ.get("EDITOR", "vi")) |
|
99 | 99 | |
|
100 | 100 | os.environ["HGUSER"] = self.username() |
General Comments 0
You need to be logged in to leave comments.
Login now