/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-receive-pack

Found an actual bug.

Dirstate.update_by_delta was using os.path.join() to handle the 'new path'
for renames. Which meant that on Windows the rename of 'a/b' => 'c/d'
would show as a rename of 'a/b' => 'c/d' (the reverse of 'c/d <= 'a/b'
was correct though...)

The simple fix is to just use osutils.pathjoin() in both places.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr-receive-pack
1
 
#!/usr/bin/env python
2
 
import bzrlib
3
 
from bzrlib.plugins.git.server import BzrBackend
4
 
from dulwich.server import ReceivePackHandler
5
 
import sys, os
6
 
 
7
 
if len(sys.argv) != 2 or not os.path.isdir(sys.argv[1]):
8
 
    print "usage: git-receive-pack <git-dir>"
9
 
    sys.exit(1)
10
 
 
11
 
backend = BzrBackend(sys.argv[1])
12
 
 
13
 
def write_fn(data):
14
 
    sys.stdout.write(data)
15
 
    sys.stdout.flush()
16
 
 
17
 
server = ReceivePackHandler(backend, sys.stdin.read, write_fn)
18
 
server.handle()