equal
deleted
inserted
replaced
113 self.write(msg, " ") |
113 self.write(msg, " ") |
114 r = self.readline() |
114 r = self.readline() |
115 if re.match(pat, r): |
115 if re.match(pat, r): |
116 return r |
116 return r |
117 else: |
117 else: |
118 self.write("unrecognized response\n") |
118 self.write(_("unrecognized response\n")) |
119 def status(self, *msg): |
119 def status(self, *msg): |
120 if not self.quiet: self.write(*msg) |
120 if not self.quiet: self.write(*msg) |
121 def warn(self, *msg): |
121 def warn(self, *msg): |
122 self.write_err(*msg) |
122 self.write_err(*msg) |
123 def note(self, *msg): |
123 def note(self, *msg): |
134 editor = (os.environ.get("HGEDITOR") or |
134 editor = (os.environ.get("HGEDITOR") or |
135 self.config("ui", "editor") or |
135 self.config("ui", "editor") or |
136 os.environ.get("EDITOR", "vi")) |
136 os.environ.get("EDITOR", "vi")) |
137 |
137 |
138 os.environ["HGUSER"] = self.username() |
138 os.environ["HGUSER"] = self.username() |
139 util.system("%s %s" % (editor, name), errprefix="edit failed") |
139 util.system("%s %s" % (editor, name), errprefix=_("edit failed")) |
140 |
140 |
141 t = open(name).read() |
141 t = open(name).read() |
142 t = re.sub("(?m)^HG:.*\n", "", t) |
142 t = re.sub("(?m)^HG:.*\n", "", t) |
143 |
143 |
144 os.unlink(name) |
144 os.unlink(name) |