Mercurial > kallithea
changeset 2197:b14d8bd96144 beta
Synced SimpleGitUploadPackHandler with latest dulwich code
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 17 Apr 2012 21:41:46 +0200 |
parents | 7ccf403b9c3f |
children | 9784a54a0f5b |
files | rhodecode/lib/middleware/simplegit.py |
diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/middleware/simplegit.py Tue Apr 17 21:40:49 2012 +0200 +++ b/rhodecode/lib/middleware/simplegit.py Tue Apr 17 21:41:46 2012 +0200 @@ -44,13 +44,14 @@ graph_walker.determine_wants, graph_walker, self.progress, get_tagged=self.get_tagged) - # Do they want any objects? - if objects_iter is None or len(objects_iter) == 0: + # Did the process short-circuit (e.g. in a stateless RPC call)? Note + # that the client still expects a 0-object pack in most cases. + if objects_iter is None: return self.progress("counting objects: %d, done.\n" % len(objects_iter)) dulserver.write_pack_objects(dulserver.ProtocolFile(None, write), - objects_iter, len(objects_iter)) + objects_iter) messages = [] messages.append('thank you for using rhodecode') @@ -59,6 +60,7 @@ # we are done self.proto.write("0000") + dulserver.DEFAULT_HANDLERS = { 'git-upload-pack': SimpleGitUploadPackHandler, 'git-receive-pack': dulserver.ReceivePackHandler,