Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/httprepo.py @ 3105:ef4e5d05bac4
Merge with mainline
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 16:02:09 -0500 |
parents | bc3fe3b5b785 |
children | cff3c58a5766 |
comparison
equal
deleted
inserted
replaced
3104:e6818b0b8154 | 3105:ef4e5d05bac4 |
---|---|
323 return ret | 323 return ret |
324 finally: | 324 finally: |
325 rfp.close() | 325 rfp.close() |
326 except socket.error, err: | 326 except socket.error, err: |
327 if err[0] in (errno.ECONNRESET, errno.EPIPE): | 327 if err[0] in (errno.ECONNRESET, errno.EPIPE): |
328 raise util.Abort(_('push failed: %s'), err[1]) | 328 raise util.Abort(_('push failed: %s') % err[1]) |
329 raise util.Abort(err[1]) | 329 raise util.Abort(err[1]) |
330 finally: | 330 finally: |
331 fp.close() | 331 fp.close() |
332 os.unlink(tempname) | 332 os.unlink(tempname) |
333 | 333 |