Mercurial > public > mercurial-scm > hg-stable
diff mercurial/streamclone.py @ 9508:e2fd9b62349b
Merge with -stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 30 Sep 2009 21:42:51 -0500 |
parents | 4c041f1ee1b4 49b62395e910 |
children | 25e572394f5c |
line wrap: on
line diff
--- a/mercurial/streamclone.py Thu Oct 01 00:00:18 2009 +0200 +++ b/mercurial/streamclone.py Wed Sep 30 21:42:51 2009 -0500 @@ -48,8 +48,7 @@ try: repo.ui.debug('scanning\n') for name, ename, size in repo.store.walk(): - # for backwards compat, name was partially encoded - entries.append((store.encodedir(name), size)) + entries.append((name, size)) total_bytes += size finally: lock.release() @@ -62,6 +61,7 @@ yield '%d %d\n' % (len(entries), total_bytes) for name, size in entries: repo.ui.debug('sending %s (%d bytes)\n' % (name, size)) - yield '%s\0%d\n' % (name, size) + # partially encode name over the wire for backwards compat + yield '%s\0%d\n' % (store.encodedir(name), size) for chunk in util.filechunkiter(repo.sopener(name), limit=size): yield chunk