/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 work on roundtrip push support.

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