← Back to branch summary

~jelmer/bzr-git/index-based

« back to all changes in this revision

Viewing changes to server.py

  • Committer: Jelmer Vernooij
  • Date: 2010-06-23 19:07:06 UTC
  • mfrom: (677.7.182 trunk)
  • Revision ID: jelmer@samba.org-20100623190706-t2mqoj2o304ni80f
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
16
16
# along with this program; if not, write to the Free Software
17
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
18
 
19
 
import os
20
 
import tempfile
21
 
 
22
19
from dulwich.server import TCPGitServer
23
20
 
24
21
from bzrlib.bzrdir import (
25
22
    BzrDir,
26
 
    BzrDirFormat,
27
23
    )
28
24
 
29
 
from bzrlib.plugins.git.fetch import (
30
 
    import_git_objects,
31
 
    )
32
25
from bzrlib.plugins.git.mapping import (
33
26
    default_mapping,
34
27
    )
35
28
from bzrlib.plugins.git.object_store import (
36
29
    get_object_store
37
30
    )
 
31
from bzrlib.plugins.git.refs import (
 
32
    BazaarRefsContainer,
 
33
    )
38
34
 
39
35
from dulwich.server import (
40
36
    Backend,
41
37
    BackendRepo,
42
38
    )
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
 
    )
51
39
 
52
40
class BzrBackend(Backend):
53
41
    """A git serve backend that can use a Bazaar repository."""
57
45
        self.mapping = default_mapping
58
46
 
59
47
    def open_repository(self, path):
60
 
        # FIXME: Sanitize path properly
61
 
        return BzrBackendRepo(self.transport.clone(path.lstrip("/")), self.mapping)
 
48
        # FIXME: More secure path sanitization
 
49
        return BzrBackendRepo(self.transport.clone(path.lstrip("/")),
 
50
            self.mapping)
62
51
 
63
52
 
64
53
class BzrBackendRepo(BackendRepo):
69
58
        self.repo_dir = BzrDir.open_from_transport(self.transport)
70
59
        self.repo = self.repo_dir.find_repository()
71
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..
72
63
 
73
64
    def get_refs(self):
74
 
        """Return a dict of all tags and branches in repository (and shas) """
75
 
        ret = {}
76
 
        branch = None
77
 
        for branch in self.repo.find_branches(using=True):
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.nick] = self.object_store._lookup_revision_sha1(branch.last_revision())
83
 
        if 'HEAD' not in ret and branch:
84
 
            ret['HEAD'] = self.object_store._lookup_revision_sha1(branch.last_revision())
85
 
        return ret
86
 
 
87
 
    def apply_pack(self, refs, read):
88
 
        """Apply pack from client to current repository"""
89
 
 
90
 
        fd, path = tempfile.mkstemp(suffix=".pack")
91
 
        f = os.fdopen(fd, 'w')
92
 
        f.write(read())
93
 
        f.close()
94
 
 
95
 
        p = PackData(path)
96
 
        entries = p.sorted_entries()
97
 
        heads = []
98
 
        for e in entries:
99
 
            sha = e[0]
100
 
            offset = e[1]
101
 
            t, o = p.get_object_at (offset)
102
 
            if t == 1 or t == 4:
103
 
                heads.append(sha)
104
 
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
105
 
 
106
 
        objects = {}
107
 
        for tup in p.iterobjects():
108
 
            obj_type, obj = p.get_object_at (tup[0])
109
 
            if obj_type in range(1, 4):
110
 
                sf = ShaFile.from_raw_string (obj_type, obj)
111
 
                objects[hex_to_sha(sf.id)] = sf
112
 
 
113
 
        self.repo.lock_write()
 
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()
114
76
        try:
115
 
            self.repo.start_write_group()
116
 
            try:
117
 
                import_git_objects(self.repo, self.mapping, objects,
118
 
                                   self.object_store,
119
 
                                   heads)
120
 
            except:
121
 
                self.repo.abort_write_group()
122
 
                raise
123
 
            else:
124
 
                self.repo.commit_write_group()
 
77
            have = self.object_store.find_common_revisions(graph_walker)
 
78
            return self.object_store.generate_pack_contents(have, wants, progress,
 
79
                get_tagged)
125
80
        finally:
126
81
            self.repo.unlock()
127
82
 
128
 
        for oldsha, sha, ref in refs:
129
 
            if ref[:11] == 'refs/heads/':
130
 
                branch_nick = ref[11:]
131
 
                transport = self.repo.root_transport.clone(branch_nick)
132
 
 
133
 
                try:
134
 
                    target_dir = BzrDir.open_from_transport(transport)
135
 
                except:
136
 
                    format = BzrDirFormat.get_default_format()
137
 
                    format.initialize_on_transport(transport)
138
 
 
139
 
                try:
140
 
                    target_branch = target_dir.open_branch()
141
 
                except:
142
 
                    target_branch = target_dir.create_branch()
143
 
 
144
 
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
145
 
                target_branch.generate_revision_history(rev_id)
146
 
 
147
 
    def fetch_objects(self, determine_wants, graph_walker, progress):
148
 
        """ yield git objects to send to client """
149
 
        # If this is a Git repository, just use the existing fetch_objects implementation.
150
 
        if getattr(self.repo, "fetch_objects", None) is not None:
151
 
            return self.repo.fetch_objects(determine_wants, graph_walker, None, progress)[0]
152
 
 
153
 
        wants = determine_wants(self.get_refs())
154
 
        graph_walker.reset()
155
 
        have = self.object_store.find_common_revisions(graph_walker)
156
 
        return self.object_store.generate_pack_contents(have, wants)
157
 
 
158
83
 
159
84
def serve_git(transport, host=None, port=None, inet=False):
160
85
    backend = BzrBackend(transport)