/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: Jan Hudec
  • Date: 2006-11-25 20:38:39 UTC
  • mto: (2199.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2200.
  • Revision ID: bulb@ucw.cz-20061125203839-9nuhv32z63hb8811
Option --pull for merge command.

Option --pull was added to merge command, that, if the merge would be
trivial, ie. if the common ancestor is equal to the local tip, causes pull of
the remote instead of creating the merger.

Simple test for this option is included.

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