Mercurial > hg
comparison hgext/convert/cvs.py @ 7513:fed8f75f29ce
convert-cvs: correctly handle Removed replies, fixes bug 1427
author | Frank Kingswood <frank@kingswood-consulting.co.uk> |
---|---|
date | Thu, 11 Dec 2008 13:33:35 +0000 |
parents | f792c7bb2fb3 |
children | 992d78981cba |
comparison
equal
deleted
inserted
replaced
7512:0d488f7f321d | 7513:fed8f75f29ce |
---|---|
326 return (data, "x" in mode and "x" or "") | 326 return (data, "x" in mode and "x" or "") |
327 elif line.startswith("E "): | 327 elif line.startswith("E "): |
328 self.ui.warn(_("cvs server: %s\n") % line[2:]) | 328 self.ui.warn(_("cvs server: %s\n") % line[2:]) |
329 elif line.startswith("Remove"): | 329 elif line.startswith("Remove"): |
330 l = self.readp.readline() | 330 l = self.readp.readline() |
331 l = self.readp.readline() | |
332 if l != "ok\n": | |
333 raise util.Abort(_("unknown CVS response: %s") % l) | |
334 else: | 331 else: |
335 raise util.Abort(_("unknown CVS response: %s") % line) | 332 raise util.Abort(_("unknown CVS response: %s") % line) |
336 | 333 |
337 def getfile(self, file, rev): | 334 def getfile(self, file, rev): |
338 data, mode = self._getfile(file, rev) | 335 data, mode = self._getfile(file, rev) |