/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

Fix #339055 and #277444 by handling non ascii symlink targets.

* bzrlib/tests/tree_implementations/test_path_content_summary.py:
(TestPathContentSummary.test_unicode_symlink_target_summary): Test
adding a non ascii symlink target.

* bzrlib/tests/workingtree_implementations/test_parents.py:
(TestSetParents.test_unicode_symlink): Should not fail anymore

* bzrlib/tests/branch_implementations/test_sprout.py:
(TestSprout.test_sprout_with_unicode_symlink): Should not fail anymore.

* bzrlib/workingtree.py:
(WorkingTree.path_content_summary): Get the symlink target as
unicode.

* bzrlib/transform.py:
(_PreviewTree.path_content_summary): Get the symlink target as
unicode.

* bzrlib/dirstate.py:
(DirState._read_link): abspath should stay in Unicode.
(DirState._inv_entry_to_details): Encode path in utf8 for the
fingerprint.

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