/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: 2007-06-26 20:32:49 UTC
  • mto: (2581.1.1 cleanup-runbzr)
  • mto: This revision was merged to the branch mainline in revision 2588.
  • Revision ID: v.ladeuil+lp@free.fr-20070626203249-sqm4afiai5dxofum
Deprecate the varargs syntax and fix the tests.

* bzrlib/tests/__init__.py:
(TestCase.run_bzr): Activate the deprecation warning.
(TestCase.run_bzr_error): Add error_regexes to kwargs or run_bzr
get confused.

* bzrlib/tests/blackbox/test_selftest.py:
(TestRunBzr.test_args): Activate.

* bzrlib/tests/blackbox/test_inventory.py:
(TestInventory.assertInventoryEqual): Build the command from args
if not None.

* bzrlib/tests/blackbox/test_ls.py:
(TestLS.ls_equals): Build the command from args if not None.

* bzrlib/tests/blackbox/test_remove_tree.py:
(TestRemoveTree.test_remove_tree_lightweight_checkout_explicit):
Nice catch, we were calling run_bzr instead of run_bzr_error. This
went unnoticed for some time...

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.plugins.git.server import BzrBackend
4
 
from dulwich.server import UploadPackHandler
5
 
import sys, os, optparse
6
 
 
7
 
parser = optparse.OptionParser(usage="usage: git-upload-pack [--strict] [--timeout=nn] <dir>")
8
 
parser.add_option("--strict", action="store_true", dest="strict", default=False)
9
 
parser.add_option("--timeout", type="int", dest="timeout", default=-1)
10
 
options, args = parser.parse_args()
11
 
 
12
 
if len(args) != 1 or not os.path.isdir(args[0]):
13
 
    print "usage: " + parser.usage
14
 
    sys.exit(1)
15
 
 
16
 
backend = BzrBackend(sys.argv[1])
17
 
 
18
 
def write_fn(data):
19
 
    sys.stdout.write(data)
20
 
    sys.stdout.flush()
21
 
 
22
 
server = UploadPackHandler(backend, sys.stdin.read, write_fn)
23
 
server.handle()