Mercurial > hg
comparison hgext/convert/cvs.py @ 7519:992d78981cba
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 14 Dec 2008 18:13:41 +0100 |
| parents | 9d457bb38de5 fed8f75f29ce |
| children | d812029cda85 |
comparison
equal
deleted
inserted
replaced
| 7518:dd66d161a14b | 7519:992d78981cba |
|---|---|
| 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) |