/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

Update to newer version of Dulwich, saner branch names.

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
 
19
22
from dulwich.server import TCPGitServer
20
23
 
21
24
from bzrlib.bzrdir import (
22
25
    BzrDir,
 
26
    BzrDirFormat,
23
27
    )
24
28
 
 
29
from bzrlib.plugins.git.fetch import (
 
30
    import_git_objects,
 
31
    BazaarObjectStore,
 
32
    )
25
33
from bzrlib.plugins.git.mapping import (
26
34
    default_mapping,
27
35
    )
28
36
from bzrlib.plugins.git.object_store import (
29
37
    get_object_store
30
38
    )
31
 
from bzrlib.plugins.git.refs import (
32
 
    BazaarRefsContainer,
33
 
    )
34
39
 
35
40
from dulwich.server import (
36
41
    Backend,
37
42
    BackendRepo,
38
43
    )
 
44
from dulwich.pack import (
 
45
    PackData,
 
46
    write_pack_index_v2,
 
47
    )
 
48
from dulwich.objects import (
 
49
    ShaFile,
 
50
    hex_to_sha,
 
51
    )
39
52
 
40
53
class BzrBackend(Backend):
41
54
    """A git serve backend that can use a Bazaar repository."""
45
58
        self.mapping = default_mapping
46
59
 
47
60
    def open_repository(self, path):
48
 
        # FIXME: More secure path sanitization
49
 
        return BzrBackendRepo(self.transport.clone(path.lstrip("/")),
50
 
            self.mapping)
 
61
        return BzrBackendRepo(self.transport.clone(path), self.mapping)
51
62
 
52
63
 
53
64
class BzrBackendRepo(BackendRepo):
58
69
        self.repo_dir = BzrDir.open_from_transport(self.transport)
59
70
        self.repo = self.repo_dir.find_repository()
60
71
        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
72
 
64
73
    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):
 
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
        repo_dir = BzrDir.open_from_transport(self.transport)
 
107
        target = repo_dir.find_repository()
 
108
 
 
109
        objects = {}
 
110
        for tup in p.iterobjects():
 
111
            obj_type, obj = p.get_object_at (tup[0])
 
112
            if obj_type in range(1, 4):
 
113
                sf = ShaFile.from_raw_string (obj_type, obj)
 
114
                objects[hex_to_sha(sf.id)] = sf
 
115
 
 
116
        target.lock_write()
 
117
        try:
 
118
            target.start_write_group()
 
119
            try:
 
120
                import_git_objects(target, self.mapping, objects,
 
121
                                   BazaarObjectStore (target, self.mapping),
 
122
                                   heads)
 
123
            except:
 
124
                target.abort_write_group()
 
125
                raise
 
126
            else:
 
127
                target.commit_write_group()
 
128
        finally:
 
129
            target.unlock()
 
130
 
 
131
        for oldsha, sha, ref in refs:
 
132
            if ref[:11] == 'refs/heads/':
 
133
                branch_nick = ref[11:]
 
134
                transport = self.transport.clone(branch_nick)
 
135
 
 
136
                try:
 
137
                    target_dir = BzrDir.open_from_transport(transport)
 
138
                except:
 
139
                    format = BzrDirFormat.get_default_format()
 
140
                    format.initialize_on_transport(transport)
 
141
 
 
142
                try:
 
143
                    target_branch = target_dir.open_branch()
 
144
                except:
 
145
                    target_branch = target_dir.create_branch()
 
146
 
 
147
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
148
                target_branch.generate_revision_history(rev_id)
 
149
 
 
150
    def fetch_objects(self, determine_wants, graph_walker, progress):
72
151
        """ yield git objects to send to client """
 
152
        bzrdir = BzrDir.open_from_transport(self.transport)
 
153
        repo = bzrdir.find_repository()
 
154
 
 
155
        # If this is a Git repository, just use the existing fetch_objects implementation.
 
156
        if getattr(repo, "fetch_objects", None) is not None:
 
157
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)[0]
73
158
 
74
159
        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()
 
160
        graph_walker.reset()
 
161
        repo.lock_read()
 
162
        store = BazaarObjectStore(repo)
 
163
        have = store.find_common_revisions(graph_walker)
 
164
        missing_sha1s = store.find_missing_objects(have, wants, progress)
 
165
        return store.iter_shas(missing_sha1s)
82
166
 
83
167
 
84
168
def serve_git(transport, host=None, port=None, inet=False):