/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzr-upload-pack

  • Committer: Vincent Ladeuil
  • Date: 2009-05-08 13:39:32 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090508133932-4fbx4z8fvraeyjdy
Fixed as per John's and Markus reviews.

* bzrlib/tests/blackbox/test_push.py:
(TestPush.test_push_with_revisionspec): Fix wrong run_bzr_error
call. Additionnally the error regexp was wrong !

* bzrlib/tests/blackbox/test_ls.py:
(TestLS.test_ls_path, TestLS.test_kinds): Fix wrong run_bzr_error
calls.

* bzrlib/tests/__init__.py:
(TestCase.run_bzr): Add a check to catch errors in error_regexes
usage where people use a a string that it then iterated char by
char for matching (which is most certainly not the intent of the
test writer).

* bzrlib/tests/blackbox/test_log.py:
Fix run_bzr_error calls. Fix some white spaces issues (some
expected strings were using TABs and were wrongly caught by
test_coding_style(), but fixing the strings wasn't really a
problem either.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr-upload-pack
1
 
#!/usr/bin/env python
2
 
import bzrlib
3
 
from bzrlib.plugin import load_plugins
4
 
load_plugins ()
5
 
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
16
 
    sys.exit(1)
17
 
 
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()