/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

Keep inventory entry children around once we've fetched them.

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
 
 
17
import os
 
18
import tempfile
 
19
 
19
20
from dulwich.server import TCPGitServer
 
21
import os
20
22
 
21
23
from bzrlib.bzrdir import (
22
24
    BzrDir,
 
25
    BzrDirFormat,
 
26
    )
 
27
from bzrlib.repository import (
 
28
    Repository,
23
29
    )
24
30
 
 
31
from bzrlib.plugins.git.fetch import (
 
32
    import_git_objects,
 
33
    BazaarObjectStore,
 
34
    )
25
35
from bzrlib.plugins.git.mapping import (
26
36
    default_mapping,
27
37
    )
28
38
from bzrlib.plugins.git.object_store import (
29
39
    get_object_store
30
40
    )
31
 
from bzrlib.plugins.git.refs import (
32
 
    BazaarRefsContainer,
33
 
    )
34
41
 
35
42
from dulwich.server import (
36
43
    Backend,
37
 
    BackendRepo,
38
 
    )
 
44
    )
 
45
from dulwich.pack import (
 
46
    Pack,
 
47
    PackData,
 
48
    write_pack_index_v2,
 
49
    )
 
50
 
39
51
 
40
52
class BzrBackend(Backend):
41
 
    """A git serve backend that can use a Bazaar repository."""
42
53
 
43
54
    def __init__(self, transport):
44
55
        self.transport = transport
45
56
        self.mapping = default_mapping
46
57
 
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
58
    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):
 
59
        """ return a dict of all tags and branches in repository (and shas) """
 
60
        ret = {}
 
61
        repo_dir = BzrDir.open_from_transport(self.transport)
 
62
        repo = repo_dir.find_repository()
 
63
        repo.lock_read()
 
64
        try:
 
65
            store = get_object_store(repo)
 
66
            branch = None
 
67
            for branch in repo.find_branches(using=True):
 
68
                #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
 
69
                #FIXME: Need to get branch path relative to its repository and use this instead of nick
 
70
                ret["refs/heads/"+branch.nick] = store._lookup_revision_sha1(branch.last_revision())
 
71
            if 'HEAD' not in ret and branch:
 
72
                ret['HEAD'] = store._lookup_revision_sha1(branch.last_revision())
 
73
        finally:
 
74
            repo.unlock()
 
75
        return ret
 
76
 
 
77
    def apply_pack(self, refs, read):
 
78
        """ apply pack from client to current repository """
 
79
 
 
80
        fd, path = tempfile.mkstemp(suffix=".pack")
 
81
        f = os.fdopen(fd, 'w')
 
82
        f.write(read())
 
83
        f.close()
 
84
 
 
85
        p = PackData(path)
 
86
        entries = p.sorted_entries()
 
87
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
 
88
 
 
89
        def get_objects():
 
90
            pack = Pack(path[:-5])
 
91
            for obj in pack.iterobjects():
 
92
                yield obj
 
93
 
 
94
        target = Repository.open_from_transport(self.transport)
 
95
 
 
96
        target.lock_write()
 
97
        try:
 
98
            target.start_write_group()
 
99
            try:
 
100
                import_git_objects(target, self.mapping, iter(get_objects()))
 
101
            finally:
 
102
                target.commit_write_group()
 
103
        finally:
 
104
            target.unlock()
 
105
 
 
106
        for oldsha, sha, ref in refs:
 
107
            if ref[:11] == 'refs/heads/':
 
108
                branch_nick = ref[11:]
 
109
                transport = self.transport.clone(branch_nick)
 
110
 
 
111
                try:
 
112
                    target_dir = BzrDir.open_from_transport(transport)
 
113
                except:
 
114
                    format = BzrDirFormat.get_default_format()
 
115
                    format.initialize_on_transport(transport)
 
116
 
 
117
                try:
 
118
                    target_branch = target_dir.open_branch()
 
119
                except:
 
120
                    target_branch = target_dir.create_branch()
 
121
 
 
122
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
123
                target_branch.generate_revision_history(rev_id)
 
124
 
 
125
    def fetch_objects(self, determine_wants, graph_walker, progress):
72
126
        """ yield git objects to send to client """
 
127
        bzrdir = BzrDir.open_from_transport(self.transport)
 
128
        repo = bzrdir.find_repository()
 
129
 
 
130
        # If this is a Git repository, just use the existing fetch_objects implementation.
 
131
        if getattr(repo, "fetch_objects", None) is not None:
 
132
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
73
133
 
74
134
        wants = determine_wants(self.get_refs())
75
 
        self.repo.lock_read()
76
 
        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)
80
 
        finally:
81
 
            self.repo.unlock()
 
135
        repo.lock_read()
 
136
        store = BazaarObjectStore(repo)
 
137
        have = store.find_common_revisions(graph_walker)
 
138
        missing_sha1s = store.find_missing_objects(have, wants, progress)
 
139
        return store.iter_shas(missing_sha1s)
82
140
 
83
141
 
84
142
def serve_git(transport, host=None, port=None, inet=False):
85
143
    backend = BzrBackend(transport)
86
144
 
87
 
    if host is None:
88
 
        host = 'localhost'
89
 
    if port:
90
 
        server = TCPGitServer(backend, host, port)
91
 
    else:
92
 
        server = TCPGitServer(backend, host)
 
145
    server = TCPGitServer(backend, 'localhost')
93
146
    server.serve_forever()