/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 server.py

Merge John.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
1
 
# Copyright (C) 2008 Jelmer Vernooij
2
 
# Copyright (C) 2008 John Carr
3
1
# Copyright (C) 2008 Canonical Ltd
4
2
#
5
3
# This program is free software; you can redistribute it and/or modify
16
14
# along with this program; if not, write to the Free Software
17
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
16
 
19
 
from dulwich.server import TCPGitServer
20
 
 
21
 
from bzrlib.bzrdir import (
22
 
    BzrDir,
23
 
    )
24
 
 
25
 
from bzrlib.plugins.git.mapping import (
26
 
    default_mapping,
27
 
    )
28
 
from bzrlib.plugins.git.object_store import (
29
 
    get_object_store
30
 
    )
31
 
from bzrlib.plugins.git.refs import (
32
 
    BazaarRefsContainer,
33
 
    )
34
 
 
35
 
from dulwich.server import (
36
 
    Backend,
37
 
    BackendRepo,
38
 
    )
 
17
from bzrlib.bzrdir import BzrDir
 
18
from bzrlib.repository import Repository
 
19
 
 
20
from bzrlib.plugins.git.fetch import import_git_objects
 
21
from bzrlib.plugins.git.mapping import default_mapping
 
22
 
 
23
from dulwich.server import Backend
 
24
from dulwich.pack import Pack, PackData, write_pack_index_v2
 
25
from dulwich.objects import ShaFile
 
26
 
 
27
import os, tempfile
39
28
 
40
29
class BzrBackend(Backend):
41
 
    """A git serve backend that can use a Bazaar repository."""
42
30
 
43
 
    def __init__(self, transport):
44
 
        self.transport = transport
 
31
    def __init__(self, directory):
 
32
        self.directory = directory
45
33
        self.mapping = default_mapping
46
34
 
47
 
    def open_repository(self, path):
48
 
        # FIXME: More secure path sanitization
49
 
        return BzrBackendRepo(self.transport.clone(path.lstrip("/")),
50
 
            self.mapping)
51
 
 
52
 
 
53
 
class BzrBackendRepo(BackendRepo):
54
 
 
55
 
    def __init__(self, transport, mapping):
56
 
        self.transport = transport
57
 
        self.mapping = mapping
58
 
        self.repo_dir = BzrDir.open_from_transport(self.transport)
59
 
        self.repo = self.repo_dir.find_repository()
60
 
        self.object_store = get_object_store(self.repo)
61
 
        self.refs = BazaarRefsContainer(self.repo_dir, self.object_store)
62
 
        self._refs = self.refs.as_dict() # Much faster for now..
63
 
 
64
35
    def get_refs(self):
65
 
        return self._refs
66
 
 
67
 
    def get_peeled(self, name):
68
 
        return self.get_refs()[name]
69
 
 
70
 
    def fetch_objects(self, determine_wants, graph_walker, progress,
71
 
        get_tagged=None):
72
 
        """ yield git objects to send to client """
73
 
 
74
 
        wants = determine_wants(self.get_refs())
75
 
        self.repo.lock_read()
 
36
        """ return a dict of all tags and branches in repository (and shas) """
 
37
        return {}
 
38
 
 
39
    def apply_pack(self, refs, read):
 
40
        """ apply pack from client to current repository """
 
41
 
 
42
        fd, path = tempfile.mkstemp(suffix=".pack")
 
43
        f = os.fdopen(fd, 'w')
 
44
        f.write(read())
 
45
        f.close()
 
46
 
 
47
        p = PackData(path)
 
48
        entries = p.sorted_entries()
 
49
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
 
50
 
 
51
        def get_objects():
 
52
            pack = Pack(path[:-5])
 
53
            for obj in pack.iterobjects():
 
54
                yield obj
 
55
 
 
56
        target = Repository.open(self.directory)
 
57
 
 
58
        target.lock_write()
76
59
        try:
77
 
            have = self.object_store.find_common_revisions(graph_walker)
78
 
            return self.object_store.generate_pack_contents(have, wants, progress,
79
 
                get_tagged)
 
60
            target.start_write_group()
 
61
            try:
 
62
                import_git_objects(target, self.mapping, iter(get_objects()))
 
63
            finally:
 
64
                target.commit_write_group()
80
65
        finally:
81
 
            self.repo.unlock()
82
 
 
83
 
 
84
 
def serve_git(transport, host=None, port=None, inet=False):
85
 
    backend = BzrBackend(transport)
86
 
 
87
 
    if host is None:
88
 
        host = 'localhost'
89
 
    if port:
90
 
        server = TCPGitServer(backend, host, port)
91
 
    else:
92
 
        server = TCPGitServer(backend, host)
93
 
    server.serve_forever()
 
66
            target.unlock()
 
67
 
 
68
        for oldsha, sha, ref in refs:
 
69
            if ref[:11] == 'refs/heads/':
 
70
                branch_nick = ref[11:]
 
71
 
 
72
                try:
 
73
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
 
74
                except:
 
75
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
 
76
 
 
77
                try:
 
78
                    target_branch = target_dir.open_branch()
 
79
                except:
 
80
                    target_branch = target_dir.create_branch()
 
81
               
 
82
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
83
                target_branch.generate_revision_history(rev_id) 
 
84
 
 
85
    def fetch_objects(self, determine_wants, graph_walker, progress):
 
86
        """ yield git objects to send to client """
 
87