/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-03-14 10:37:18 UTC
  • mto: (1551.12.56 mergedirective-fixes)
  • mto: This revision was merged to the branch mainline in revision 2359.
  • Revision ID: v.ladeuil+lp@free.fr-20070314103718-zg7lmw9jc584l1xd
Fix bug #92195.

* tests/blackbox/test_merge_directive.py:
(TestMergeDirective.prepare_merge_directive): Set smtp_server in
branch config.
(TestMergeDirective.test_mail): Check that the smtp_server is
taken into account.

* builtins.py:
(cmd_merge_directive.run): Provide config smtp_server to
SMTP.connect().

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()