##// END OF EJS Templates
convert.cvs: Initialize state variable and abort on cvs error...
Mads Kiilerich -
r10800:49c109d0 stable
parent child Browse files
Show More
@@ -227,6 +227,7 b' class convert_cvs(converter_source):'
227 self.writep.flush()
227 self.writep.flush()
228
228
229 data = ""
229 data = ""
230 mode = None
230 while 1:
231 while 1:
231 line = self.readp.readline()
232 line = self.readp.readline()
232 if line.startswith("Created ") or line.startswith("Updated "):
233 if line.startswith("Created ") or line.startswith("Updated "):
@@ -244,6 +245,8 b' class convert_cvs(converter_source):'
244 data = chunkedread(self.readp, count)
245 data = chunkedread(self.readp, count)
245 else:
246 else:
246 if line == "ok\n":
247 if line == "ok\n":
248 if mode is None:
249 raise util.Abort(_('malformed response from CVS'))
247 return (data, "x" in mode and "x" or "")
250 return (data, "x" in mode and "x" or "")
248 elif line.startswith("E "):
251 elif line.startswith("E "):
249 self.ui.warn(_("cvs server: %s\n") % line[2:])
252 self.ui.warn(_("cvs server: %s\n") % line[2:])
General Comments 0
You need to be logged in to leave comments. Login now