Mercurial > hg-stable
diff mercurial/exchange.py @ 21071:19b9f23a8c6f
bundle2: return a bundle20 object from exchanges.unbundle
When a bundle2 is pushed we return a bundle instead of an integer. We use to
return a binary stream. We now return a `bundle20` bundler to make the life of
wireprotocol implementation simpler.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Tue, 15 Apr 2014 16:49:30 -0400 |
parents | 408877d491fb |
children | 1ff06386217f |
line wrap: on
line diff
--- a/mercurial/exchange.py Tue Apr 15 16:42:52 2014 -0400 +++ b/mercurial/exchange.py Tue Apr 15 16:49:30 2014 -0400 @@ -694,10 +694,8 @@ # push can proceed if util.safehasattr(cg, 'params'): tr = repo.transaction('unbundle') - ret = bundle2.processbundle(repo, cg, lambda: tr) + r = bundle2.processbundle(repo, cg, lambda: tr).reply tr.close() - stream = util.chunkbuffer(ret.reply.getchunks()) - r = bundle2.unbundle20(repo.ui, stream) else: r = changegroup.addchangegroup(repo, cg, source, url) finally: