/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

More docstrings, prefer migrating git.db to migrating git.tdb.

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
1
3
# Copyright (C) 2008 Canonical Ltd
2
4
#
3
5
# This program is free software; you can redistribute it and/or modify
14
16
# along with this program; if not, write to the Free Software
15
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
18
 
17
 
from bzrlib.bzrdir import BzrDir
18
 
from bzrlib.repository import Repository
19
 
from bzrlib.inventory import InventoryDirectory, InventoryFile
20
 
from bzrlib.osutils import splitpath
21
 
 
22
 
from bzrlib.plugins.git.fetch import import_git_objects
23
 
from bzrlib.plugins.git.mapping import default_mapping, revision_to_commit, inventory_to_tree_and_blobs
24
 
 
25
 
from dulwich.server import Backend
26
 
from dulwich.pack import Pack, PackData, write_pack_index_v2
27
 
from dulwich.objects import ShaFile, Commit, Tree, Blob
28
 
 
29
 
import os, tempfile
30
 
 
31
 
import stat
32
 
S_IFGITLINK = 0160000
33
 
 
34
 
#S_IFREG | 0664 # *Might* see this; would fail fsck --strict
35
 
 
 
19
import os
 
20
import tempfile
 
21
 
 
22
from dulwich.server import TCPGitServer
 
23
 
 
24
from bzrlib.bzrdir import (
 
25
    BzrDir,
 
26
    )
 
27
from bzrlib.errors import (
 
28
    NotBranchError,
 
29
    )
 
30
 
 
31
from bzrlib.plugins.git.branch import (
 
32
    branch_name_to_ref,
 
33
    ref_to_branch_name,
 
34
    )
 
35
from bzrlib.plugins.git.fetch import (
 
36
    import_git_objects,
 
37
    )
 
38
from bzrlib.plugins.git.mapping import (
 
39
    default_mapping,
 
40
    )
 
41
from bzrlib.plugins.git.object_store import (
 
42
    get_object_store
 
43
    )
 
44
 
 
45
from dulwich.server import (
 
46
    Backend,
 
47
    BackendRepo,
 
48
    )
 
49
from dulwich.pack import (
 
50
    PackData,
 
51
    Pack,
 
52
    )
36
53
 
37
54
class BzrBackend(Backend):
 
55
    """A git serve backend that can use a Bazaar repository."""
38
56
 
39
 
    def __init__(self, directory):
40
 
        self.directory = directory
 
57
    def __init__(self, transport):
 
58
        self.transport = transport
41
59
        self.mapping = default_mapping
42
60
 
 
61
    def open_repository(self, path):
 
62
        # FIXME: More secure path sanitization
 
63
        return BzrBackendRepo(self.transport.clone(path.lstrip("/")),
 
64
            self.mapping)
 
65
 
 
66
 
 
67
class BzrBackendRepo(BackendRepo):
 
68
 
 
69
    def __init__(self, transport, mapping):
 
70
        self.transport = transport
 
71
        self.mapping = mapping
 
72
        self.repo_dir = BzrDir.open_from_transport(self.transport)
 
73
        self.repo = self.repo_dir.find_repository()
 
74
        self.object_store = get_object_store(self.repo)
 
75
 
 
76
    def get_peeled(self, name):
 
77
        return self.get_refs()[name]
 
78
 
43
79
    def get_refs(self):
44
 
        """ return a dict of all tags and branches in repository (and shas) """
 
80
        """Return a dict of all tags and branches in repository (and shas) """
45
81
        ret = {}
46
 
        repo_dir = BzrDir.open(self.directory)
47
 
        repo = repo_dir.open_repository()
48
 
        branch = None
49
 
        for branch in repo.find_branches(using=True):
50
 
            #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
51
 
            #FIXME: Need to get branch path relative to its repository and use this instead of nick
52
 
            ret["refs/heads/"+branch.nick] = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())[0]
53
 
        if 'HEAD' not in ret and branch:
54
 
            ret['HEAD'] = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())[0]
 
82
        self.repo.lock_read()
 
83
        try:
 
84
            for branch in self.repo_dir.list_branches():
 
85
                ref = branch_name_to_ref(branch.name, "refs/heads/master")
 
86
                ret[ref] = self.object_store._lookup_revision_sha1(
 
87
                    branch.last_revision())
 
88
                assert type(ref) == str and type(ret[ref]) == str, \
 
89
                        "(%s) %r -> %r" % (branch.name, ref, ret[ref])
 
90
 
 
91
        finally:
 
92
            self.repo.unlock()
55
93
        return ret
56
94
 
57
95
    def apply_pack(self, refs, read):
58
 
        """ apply pack from client to current repository """
 
96
        """Apply pack from client to current repository"""
59
97
 
60
98
        fd, path = tempfile.mkstemp(suffix=".pack")
61
99
        f = os.fdopen(fd, 'w')
62
100
        f.write(read())
63
101
        f.close()
64
102
 
65
 
        p = PackData(path)
66
 
        entries = p.sorted_entries()
67
 
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
68
 
 
69
 
        def get_objects():
70
 
            pack = Pack(path[:-5])
71
 
            for obj in pack.iterobjects():
72
 
                yield obj
73
 
 
74
 
        target = Repository.open(self.directory)
75
 
 
76
 
        target.lock_write()
 
103
        pd = PackData(path)
 
104
        pd.create_index_v2(path[:-5]+".idx", self.object_store.get_raw)
 
105
 
 
106
        p = Pack(path[:-5])
 
107
        heads = [k[1] for k in refs]
 
108
 
 
109
        self.repo.lock_write()
77
110
        try:
78
 
            target.start_write_group()
 
111
            self.repo.start_write_group()
79
112
            try:
80
 
                import_git_objects(target, self.mapping, iter(get_objects()))
81
 
            finally:
82
 
                target.commit_write_group()
 
113
                import_git_objects(self.repo, self.mapping, 
 
114
                    p.iterobjects(get_raw=self.object_store.get_raw),
 
115
                    self.object_store, heads)
 
116
            except:
 
117
                self.repo.abort_write_group()
 
118
                raise
 
119
            else:
 
120
                self.repo.commit_write_group()
83
121
        finally:
84
 
            target.unlock()
 
122
            self.repo.unlock()
85
123
 
86
124
        for oldsha, sha, ref in refs:
87
 
            if ref[:11] == 'refs/heads/':
88
 
                branch_nick = ref[11:]
89
 
 
90
 
                try:
91
 
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
92
 
                except:
93
 
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
94
 
 
95
 
                try:
96
 
                    target_branch = target_dir.open_branch()
97
 
                except:
98
 
                    target_branch = target_dir.create_branch()
99
 
 
100
 
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
125
            try:
 
126
                branch_name = ref_to_branch_name(ref)
 
127
            except ValueError:
 
128
                # FIXME: Cope with tags!
 
129
                continue
 
130
            try:
 
131
                target_branch = self.repo_dir.open_branch(branch_name)
 
132
            except NotBranchError:
 
133
                target_branch = self.repo.create_branch(branch_name)
 
134
 
 
135
            rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
136
            target_branch.lock_write()
 
137
            try:
101
138
                target_branch.generate_revision_history(rev_id)
 
139
            finally:
 
140
                target_branch.unlock()
102
141
 
103
 
    def fetch_objects(self, determine_wants, graph_walker, progress):
 
142
    def fetch_objects(self, determine_wants, graph_walker, progress,
 
143
        get_tagged=None):
104
144
        """ yield git objects to send to client """
105
 
        repo = Repository.open(self.directory)
106
 
 
107
145
        # If this is a Git repository, just use the existing fetch_objects implementation.
108
 
        if getattr(repo, "fetch_objects", None) is None:
109
 
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
 
146
        if getattr(self.repo, "fetch_objects", None) is not None:
 
147
            return self.repo.fetch_objects(determine_wants, graph_walker, None, progress)[0]
110
148
 
111
149
        wants = determine_wants(self.get_refs())
112
 
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
113
 
        rev_done = set()
114
 
        obj_sent = set()
115
 
 
116
 
        objects = set()
117
 
 
118
 
        repo.lock_read()
 
150
        graph_walker.reset()
 
151
 
 
152
        self.repo.lock_read()
119
153
        try:
120
 
            have = graph_walker.next()
121
 
            while have:
122
 
                rev_done.add(have)
123
 
                if repo.has_revision(self.mapping.revision_id_foreign_to_bzr(sha)):
124
 
                    graph_walker.ack(have)
125
 
                have = graph_walker.next()
126
 
 
127
 
            while commits_to_send:
128
 
                commit = commits_to_send.pop()
129
 
                if commit in rev_done:
130
 
                    continue
131
 
                rev_done.add(commit)
132
 
 
133
 
                rev = repo.get_revision(commit)
134
 
 
135
 
                commits_to_send.update([p for p in rev.parent_ids if not p in rev_done])
136
 
 
137
 
                for sha, obj, path in inventory_to_tree_and_blobs(repo, self.mapping, commit):
138
 
                    if sha not in obj_sent:
139
 
                        obj_sent.add(sha)
140
 
                        objects.add((obj, path))
141
 
 
142
 
                objects.add((revision_to_commit(rev, sha, self.mapping.revision_id_bzr_to_foreign), None))
143
 
 
 
154
            have = self.object_store.find_common_revisions(graph_walker)
 
155
            return self.object_store.generate_pack_contents(have, wants)
144
156
        finally:
145
 
            repo.unlock()
146
 
 
147
 
        return (len(objects), iter(objects))
148
 
 
 
157
            self.repo.unlock()
 
158
 
 
159
 
 
160
def serve_git(transport, host=None, port=None, inet=False):
 
161
    backend = BzrBackend(transport)
 
162
 
 
163
    if host is None:
 
164
        host = 'localhost'
 
165
    if port:
 
166
        server = TCPGitServer(backend, host, port)
 
167
    else:
 
168
        server = TCPGitServer(backend, host)
 
169
    server.serve_forever()