/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

Rename converter -> object_store, provide utility function for getting ObjectStore's.

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
 
17
import os
 
18
import stat
 
19
import tempfile
20
20
 
21
21
from bzrlib.bzrdir import (
22
22
    BzrDir,
23
23
    )
 
24
from bzrlib.inventory import (
 
25
    InventoryDirectory,
 
26
    InventoryFile,
 
27
    )
 
28
from bzrlib.osutils import (
 
29
    splitpath,
 
30
    )
 
31
from bzrlib.repository import (
 
32
    Repository,
 
33
    )
24
34
 
 
35
from bzrlib.plugins.git.converter import (
 
36
    BazaarObjectStore,
 
37
    )
 
38
from bzrlib.plugins.git.fetch import (
 
39
    import_git_objects,
 
40
    )
25
41
from bzrlib.plugins.git.mapping import (
26
42
    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,
 
43
    inventory_to_tree_and_blobs,
 
44
    revision_to_commit,
33
45
    )
34
46
 
35
47
from dulwich.server import (
36
48
    Backend,
37
 
    BackendRepo,
38
 
    )
 
49
    )
 
50
from dulwich.pack import (
 
51
    Pack,
 
52
    PackData,
 
53
    write_pack_index_v2,
 
54
    )
 
55
from dulwich.objects import (
 
56
    Blob,
 
57
    Commit,
 
58
    ShaFile,
 
59
    Tree,
 
60
    )
 
61
 
39
62
 
40
63
class BzrBackend(Backend):
41
 
    """A git serve backend that can use a Bazaar repository."""
42
64
 
43
 
    def __init__(self, transport):
44
 
        self.transport = transport
 
65
    def __init__(self, directory):
 
66
        self.directory = directory
45
67
        self.mapping = default_mapping
46
68
 
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
69
    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):
 
70
        """ return a dict of all tags and branches in repository (and shas) """
 
71
        ret = {}
 
72
        repo_dir = BzrDir.open(self.directory)
 
73
        repo = repo_dir.open_repository()
 
74
        branch = None
 
75
        for branch in repo.find_branches(using=True):
 
76
            #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
 
77
            #FIXME: Need to get branch path relative to its repository and use this instead of nick
 
78
            rev, mapping = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())
 
79
            ret["refs/heads/"+branch.nick] = rev
 
80
        if 'HEAD' not in ret and branch:
 
81
            rev, mapping = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())
 
82
            ret['HEAD'] = rev
 
83
        return ret
 
84
 
 
85
    def apply_pack(self, refs, read):
 
86
        """ apply pack from client to current repository """
 
87
 
 
88
        fd, path = tempfile.mkstemp(suffix=".pack")
 
89
        f = os.fdopen(fd, 'w')
 
90
        f.write(read())
 
91
        f.close()
 
92
 
 
93
        p = PackData(path)
 
94
        entries = p.sorted_entries()
 
95
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
 
96
 
 
97
        def get_objects():
 
98
            pack = Pack(path[:-5])
 
99
            for obj in pack.iterobjects():
 
100
                yield obj
 
101
 
 
102
        target = Repository.open(self.directory)
 
103
 
 
104
        target.lock_write()
 
105
        try:
 
106
            target.start_write_group()
 
107
            try:
 
108
                import_git_objects(target, self.mapping, iter(get_objects()))
 
109
            finally:
 
110
                target.commit_write_group()
 
111
        finally:
 
112
            target.unlock()
 
113
 
 
114
        for oldsha, sha, ref in refs:
 
115
            if ref[:11] == 'refs/heads/':
 
116
                branch_nick = ref[11:]
 
117
 
 
118
                try:
 
119
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
 
120
                except:
 
121
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
 
122
 
 
123
                try:
 
124
                    target_branch = target_dir.open_branch()
 
125
                except:
 
126
                    target_branch = target_dir.create_branch()
 
127
 
 
128
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
129
                target_branch.generate_revision_history(rev_id)
 
130
 
 
131
    def fetch_objects(self, determine_wants, graph_walker, progress):
72
132
        """ yield git objects to send to client """
 
133
        repo = Repository.open(self.directory)
 
134
 
 
135
        # If this is a Git repository, just use the existing fetch_objects implementation.
 
136
        if getattr(repo, "fetch_objects", None) is not None:
 
137
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
 
138
        store = BazaarObjectStore(repo)
73
139
 
74
140
        wants = determine_wants(self.get_refs())
75
 
        self.repo.lock_read()
 
141
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
 
142
        rev_done = set()
 
143
        obj_sent = set()
 
144
        objects = set()
 
145
 
 
146
        repo.lock_read()
76
147
        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)
 
148
            have = graph_walker.next()
 
149
            while have:
 
150
                rev_done.add(have)
 
151
                if repo.has_revision(self.mapping.revision_id_foreign_to_bzr(sha)):
 
152
                    graph_walker.ack(have)
 
153
                have = graph_walker.next()
 
154
 
 
155
            while commits_to_send:
 
156
                commit = commits_to_send.pop()
 
157
                if commit in rev_done:
 
158
                    continue
 
159
                rev_done.add(commit)
 
160
 
 
161
                rev = repo.get_revision(commit)
 
162
 
 
163
                commits_to_send.update([p for p in rev.parent_ids if not p in rev_done])
 
164
 
 
165
                for sha, obj, path in inventory_to_tree_and_blobs(repo.get_inventory(commit), repo.texts, self.mapping):
 
166
                    if sha not in obj_sent:
 
167
                        obj_sent.add(sha)
 
168
                        objects.add((obj, path))
 
169
 
 
170
                objects.add((revision_to_commit(rev, sha, store._lookup_revision_sha1), None))
 
171
 
80
172
        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()
 
173
            repo.unlock()
 
174
 
 
175
        return (len(objects), iter(objects))
 
176