Mercurial > hg
changeset 6782:b9d6ab187523
streamclone yields chunks instead of accepting a file-like object
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Sun, 29 Jun 2008 14:20:01 +0200 |
| parents | b4b7261164d5 |
| children | 6d824dc86907 8ff321a381d0 |
| files | mercurial/hgweb/protocol.py mercurial/sshserver.py mercurial/streamclone.py |
| diffstat | 3 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/protocol.py Sun Jun 29 11:34:36 2008 +0200 +++ b/mercurial/hgweb/protocol.py Sun Jun 29 14:20:01 2008 +0200 @@ -205,4 +205,5 @@ def stream_out(repo, req): req.respond(HTTP_OK, HGTYPE) - streamclone.stream_out(repo, req, untrusted=True) + for chunk in streamclone.stream_out(repo, untrusted=True): + req.write(chunk)
--- a/mercurial/sshserver.py Sun Jun 29 11:34:36 2008 +0200 +++ b/mercurial/sshserver.py Sun Jun 29 14:20:01 2008 +0200 @@ -204,4 +204,6 @@ os.unlink(tempname) def do_stream_out(self): - streamclone.stream_out(self.repo, self.fout) + for chunk in streamclone.stream_out(self.repo): + self.fout.write(chunk) + self.fout.flush()
--- a/mercurial/streamclone.py Sun Jun 29 11:34:36 2008 +0200 +++ b/mercurial/streamclone.py Sun Jun 29 14:20:01 2008 +0200 @@ -51,12 +51,12 @@ # # server writes out raw file data. -def stream_out(repo, fileobj, untrusted=False): +def stream_out(repo, untrusted=False): '''stream out all metadata files in repository. writes to file-like object, must support write() and optional flush().''' if not repo.ui.configbool('server', 'uncompressed', untrusted=untrusted): - fileobj.write('1\n') + yield '1\n' return # get consistent snapshot of repo. lock during scan so lock not @@ -67,10 +67,10 @@ repolock = repo.lock() except (lock.LockHeld, lock.LockUnavailable), inst: repo.ui.warn('locking the repository failed: %s\n' % (inst,)) - fileobj.write('2\n') + yield '2\n' return - fileobj.write('0\n') + yield '0\n' repo.ui.debug('scanning\n') entries = [] total_bytes = 0 @@ -83,11 +83,9 @@ repo.ui.debug('%d files, %d bytes to transfer\n' % (len(entries), total_bytes)) - fileobj.write('%d %d\n' % (len(entries), total_bytes)) + yield '%d %d\n' % (len(entries), total_bytes) for name, size in entries: repo.ui.debug('sending %s (%d bytes)\n' % (name, size)) - fileobj.write('%s\0%d\n' % (name, size)) + yield '%s\0%d\n' % (name, size) for chunk in util.filechunkiter(repo.sopener(name), limit=size): - fileobj.write(chunk) - flush = getattr(fileobj, 'flush', None) - if flush: flush() + yield chunk