← Back to branch summary

~jelmer/bzr-git/705807-dpush

« back to all changes in this revision

Viewing changes to bzr-upload-pack

  • Committer: Jelmer Vernooij
  • Date: 2010-12-26 04:23:10 UTC
  • Revision ID: jelmer@samba.org-20101226042310-za4cib6s5ex0gjde
https://launchpad.net/bugs/681193
Fix `bzr-receive-pack` and `bzr-upload-pack`.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr-upload-pack
1
1
#!/usr/bin/env python
 
2
 
2
3
import bzrlib
3
4
from bzrlib.plugin import load_plugins
4
5
load_plugins ()
5
6
from bzrlib.plugins.git.server import BzrBackend
6
 
from dulwich.server import UploadPackHandler
7
 
import sys, os, optparse
8
 
 
9
 
parser = optparse.OptionParser(usage="usage: git-upload-pack [--strict] [--timeout=nn] <dir>")
10
 
parser.add_option("--strict", action="store_true", dest="strict", default=False)
11
 
parser.add_option("--timeout", type="int", dest="timeout", default=-1)
12
 
options, args = parser.parse_args()
13
 
 
14
 
if len(args) != 1 or not os.path.isdir(args[0]):
15
 
    print "usage: " + parser.usage
 
7
from dulwich.server import UploadPackHandler, serve_command
 
8
import sys, os
 
9
 
 
10
if len(sys.argv) < 2:
 
11
    print "usage: %s <git-dir>" % os.path.basename(sys.argv[0])
16
12
    sys.exit(1)
17
13
 
18
 
backend = BzrBackend(bzrlib.transport.get_transport(sys.argv[1]))
19
 
 
20
 
def write_fn(data):
21
 
    sys.stdout.write(data)
22
 
    sys.stdout.flush()
23
 
 
24
 
server = UploadPackHandler(backend, sys.stdin.read, write_fn)
25
 
server.handle()
 
14
backend = BzrBackend(bzrlib.transport.get_transport("/"))
 
15
sys.exit(serve_command(UploadPackHandler, backend=backend))