/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

Simplify ref determination, add asserts.

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,
23
26
    )
 
27
from bzrlib.errors import (
 
28
    NotBranchError,
 
29
    )
24
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
    )
25
38
from bzrlib.plugins.git.mapping import (
26
39
    default_mapping,
27
40
    )
28
41
from bzrlib.plugins.git.object_store import (
29
42
    get_object_store
30
43
    )
31
 
from bzrlib.plugins.git.refs import (
32
 
    BazaarRefsContainer,
33
 
    )
34
44
 
35
45
from dulwich.server import (
36
46
    Backend,
37
47
    BackendRepo,
38
48
    )
 
49
from dulwich.pack import (
 
50
    PackData,
 
51
    write_pack_index_v2,
 
52
    )
 
53
from dulwich.objects import (
 
54
    ShaFile,
 
55
    hex_to_sha,
 
56
    )
39
57
 
40
58
class BzrBackend(Backend):
41
59
    """A git serve backend that can use a Bazaar repository."""
58
76
        self.repo_dir = BzrDir.open_from_transport(self.transport)
59
77
        self.repo = self.repo_dir.find_repository()
60
78
        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
79
 
64
80
    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):
 
81
        """Return a dict of all tags and branches in repository (and shas) """
 
82
        ret = {}
 
83
        self.repo.lock_read()
 
84
        try:
 
85
            for branch in self.repo_dir.list_branches():
 
86
                ref = branch_name_to_ref(branch.name, "HEAD")
 
87
                ret[ref] = self.object_store._lookup_revision_sha1(
 
88
                    branch.last_revision())
 
89
                assert type(ref) == str and type(ret[ref]) == str, \
 
90
                        "(%s) %r -> %r" % (branch.name, ref, ret[ref])
 
91
 
 
92
        finally:
 
93
            self.repo.unlock()
 
94
        return ret
 
95
 
 
96
    def apply_pack(self, refs, read):
 
97
        """Apply pack from client to current repository"""
 
98
 
 
99
        fd, path = tempfile.mkstemp(suffix=".pack")
 
100
        f = os.fdopen(fd, 'w')
 
101
        f.write(read())
 
102
        f.close()
 
103
 
 
104
        p = PackData(path)
 
105
        entries = p.sorted_entries()
 
106
        heads = []
 
107
        for e in entries:
 
108
            sha = e[0]
 
109
            offset = e[1]
 
110
            t, o = p.get_object_at (offset)
 
111
            if t == 1 or t == 4:
 
112
                heads.append(sha)
 
113
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
 
114
 
 
115
        objects = {}
 
116
        for tup in p.iterobjects():
 
117
            obj_type, obj = p.get_object_at (tup[0])
 
118
            if obj_type in range(1, 4):
 
119
                sf = ShaFile.from_raw_string (obj_type, obj)
 
120
                objects[hex_to_sha(sf.id)] = sf
 
121
 
 
122
        self.repo.lock_write()
 
123
        try:
 
124
            self.repo.start_write_group()
 
125
            try:
 
126
                import_git_objects(self.repo, self.mapping, objects,
 
127
                                   self.object_store,
 
128
                                   heads)
 
129
            except:
 
130
                self.repo.abort_write_group()
 
131
                raise
 
132
            else:
 
133
                self.repo.commit_write_group()
 
134
        finally:
 
135
            self.repo.unlock()
 
136
 
 
137
        for oldsha, sha, ref in refs:
 
138
            try:
 
139
                branch_name = ref_to_branch_name(ref)
 
140
            except ValueError:
 
141
                # FIXME: Cope with tags!
 
142
                continue
 
143
            try:
 
144
                target_branch = self.repo_dir.open_branch(branch_name)
 
145
            except NotBranchError:
 
146
                target_branch = self.repo.create_branch(branch_name)
 
147
 
 
148
            rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
149
            target_branch.generate_revision_history(rev_id)
 
150
 
 
151
    def fetch_objects(self, determine_wants, graph_walker, progress, get_tagged=None):
72
152
        """ yield git objects to send to client """
 
153
        # If this is a Git repository, just use the existing fetch_objects implementation.
 
154
        if getattr(self.repo, "fetch_objects", None) is not None:
 
155
            return self.repo.fetch_objects(determine_wants, graph_walker, None, progress)[0]
73
156
 
74
157
        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()
 
158
        graph_walker.reset()
 
159
        have = self.object_store.find_common_revisions(graph_walker)
 
160
        return self.object_store.generate_pack_contents(have, wants)
82
161
 
83
162
 
84
163
def serve_git(transport, host=None, port=None, inet=False):