Mercurial > hg
changeset 17567:2ee7281e5aaa
wireproto: fix check-code.py breakage introduced by 6d97dd630d79
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sat, 15 Sep 2012 08:38:02 +0200 |
| parents | cd73bbc99bdc |
| children | 88244af1f66e |
| files | mercurial/wireproto.py tests/test-check-code-hg.t |
| diffstat | 2 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/wireproto.py Sat Sep 15 00:06:08 2012 +0400 +++ b/mercurial/wireproto.py Sat Sep 15 08:38:02 2012 +0200 @@ -558,7 +558,12 @@ # partially encode name over the wire for backwards compat yield '%s\0%d\n' % (store.encodedir(name), size) if size <= 65536: - yield sopener(name).read(size) + fp = sopener(name) + try: + data = fp.read(size) + finally: + fp.close() + yield data else: for chunk in util.filechunkiter(sopener(name), limit=size): yield chunk
--- a/tests/test-check-code-hg.t Sat Sep 15 00:06:08 2012 +0400 +++ b/tests/test-check-code-hg.t Sat Sep 15 08:38:02 2012 +0200 @@ -6,10 +6,6 @@ > exit 80 > fi $ hg manifest | xargs "$check_code" || echo 'FAILURE IS NOT AN OPTION!!!' - mercurial/wireproto.py:562: - > yield sopener(name).read(size) - use opener.read() instead - FAILURE IS NOT AN OPTION!!! $ hg manifest | xargs "$check_code" --warnings --nolineno --per-file=0 || true hgext/convert/cvsps.py:0: @@ -163,9 +159,6 @@ mercurial/commands.py:0: > ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no')) warning: unwrapped ui message - mercurial/wireproto.py:0: - > yield sopener(name).read(size) - use opener.read() instead tests/autodiff.py:0: > ui.write('data lost for: %s\n' % fn) warning: unwrapped ui message