/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 server fixes

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
    BzrDirFormat,
 
27
    )
 
28
 
 
29
from bzrlib.plugins.git.fetch import (
 
30
    import_git_objects,
 
31
    )
 
32
from bzrlib.plugins.git.mapping import (
 
33
    default_mapping,
 
34
    )
 
35
from bzrlib.plugins.git.object_store import (
 
36
    get_object_store
 
37
    )
 
38
 
 
39
from dulwich.server import (
 
40
    Backend,
 
41
    BackendRepo,
 
42
    )
 
43
from dulwich.pack import (
 
44
    PackData,
 
45
    write_pack_index_v2,
 
46
    )
 
47
from dulwich.objects import (
 
48
    ShaFile,
 
49
    hex_to_sha,
 
50
    )
36
51
 
37
52
class BzrBackend(Backend):
 
53
    """A git serve backend that can use a Bazaar repository."""
38
54
 
39
 
    def __init__(self, directory):
40
 
        self.directory = directory
 
55
    def __init__(self, transport):
 
56
        self.transport = transport
41
57
        self.mapping = default_mapping
42
58
 
 
59
    def open_repository(self, path):
 
60
        # FIXME: More secure path sanitization
 
61
        return BzrBackendRepo(self.transport.clone(path.lstrip("/")), self.mapping)
 
62
 
 
63
 
 
64
class BzrBackendRepo(BackendRepo):
 
65
 
 
66
    def __init__(self, transport, mapping):
 
67
        self.transport = transport
 
68
        self.mapping = mapping
 
69
        self.repo_dir = BzrDir.open_from_transport(self.transport)
 
70
        self.repo = self.repo_dir.find_repository()
 
71
        self.object_store = get_object_store(self.repo)
 
72
 
43
73
    def get_refs(self):
44
 
        """ return a dict of all tags and branches in repository (and shas) """
 
74
        """Return a dict of all tags and branches in repository (and shas) """
45
75
        ret = {}
46
 
        repo_dir = BzrDir.open(self.directory)
47
 
        repo = repo_dir.open_repository()
48
76
        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]
 
77
        for branch in self.repo_dir.list_branches():
 
78
            #FIXME: Look for 'master' or 'trunk' in here, and set HEAD
 
79
            # accordingly...
 
80
            #FIXME: Need to get branch path relative to its repository and
 
81
            # use this instead of nick
 
82
            ret["refs/heads/"+branch.name] = self.object_store._lookup_revision_sha1(branch.last_revision())
55
83
        return ret
56
84
 
57
85
    def apply_pack(self, refs, read):
58
 
        """ apply pack from client to current repository """
 
86
        """Apply pack from client to current repository"""
59
87
 
60
88
        fd, path = tempfile.mkstemp(suffix=".pack")
61
89
        f = os.fdopen(fd, 'w')
64
92
 
65
93
        p = PackData(path)
66
94
        entries = p.sorted_entries()
 
95
        heads = []
 
96
        for e in entries:
 
97
            sha = e[0]
 
98
            offset = e[1]
 
99
            t, o = p.get_object_at (offset)
 
100
            if t == 1 or t == 4:
 
101
                heads.append(sha)
67
102
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
68
103
 
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()
 
104
        objects = {}
 
105
        for tup in p.iterobjects():
 
106
            obj_type, obj = p.get_object_at (tup[0])
 
107
            if obj_type in range(1, 4):
 
108
                sf = ShaFile.from_raw_string (obj_type, obj)
 
109
                objects[hex_to_sha(sf.id)] = sf
 
110
 
 
111
        self.repo.lock_write()
77
112
        try:
78
 
            target.start_write_group()
 
113
            self.repo.start_write_group()
79
114
            try:
80
 
                import_git_objects(target, self.mapping, iter(get_objects()))
81
 
            finally:
82
 
                target.commit_write_group()
 
115
                import_git_objects(self.repo, self.mapping, objects,
 
116
                                   self.object_store,
 
117
                                   heads)
 
118
            except:
 
119
                self.repo.abort_write_group()
 
120
                raise
 
121
            else:
 
122
                self.repo.commit_write_group()
83
123
        finally:
84
 
            target.unlock()
 
124
            self.repo.unlock()
85
125
 
86
126
        for oldsha, sha, ref in refs:
87
127
            if ref[:11] == 'refs/heads/':
88
128
                branch_nick = ref[11:]
 
129
                transport = self.repo.root_transport.clone(branch_nick)
89
130
 
90
131
                try:
91
 
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
 
132
                    target_dir = BzrDir.open_from_transport(transport)
92
133
                except:
93
 
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
 
134
                    format = BzrDirFormat.get_default_format()
 
135
                    format.initialize_on_transport(transport)
94
136
 
95
137
                try:
96
138
                    target_branch = target_dir.open_branch()
100
142
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
101
143
                target_branch.generate_revision_history(rev_id)
102
144
 
103
 
    def fetch_objects(self, determine_wants, graph_walker, progress):
 
145
    def fetch_objects(self, determine_wants, graph_walker, progress, get_tagged=None):
104
146
        """ yield git objects to send to client """
105
 
        repo = Repository.open(self.directory)
106
 
 
107
147
        # 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)
 
148
        if getattr(self.repo, "fetch_objects", None) is not None:
 
149
            return self.repo.fetch_objects(determine_wants, graph_walker, None, progress)[0]
110
150
 
111
151
        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()
119
 
        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
 
 
144
 
        finally:
145
 
            repo.unlock()
146
 
 
147
 
        return (len(objects), iter(objects))
148
 
 
 
152
        graph_walker.reset()
 
153
        have = self.object_store.find_common_revisions(graph_walker)
 
154
        return self.object_store.generate_pack_contents(have, wants)
 
155
 
 
156
 
 
157
def serve_git(transport, host=None, port=None, inet=False):
 
158
    backend = BzrBackend(transport)
 
159
 
 
160
    if host is None:
 
161
        host = 'localhost'
 
162
    if port:
 
163
        server = TCPGitServer(backend, host, port)
 
164
    else:
 
165
        server = TCPGitServer(backend, host)
 
166
    server.serve_forever()