/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

Support 'bzr serve --git'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
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
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
 
17
import os
 
18
import tempfile
 
19
 
 
20
from dulwich.server import TCPGitServer
 
21
import os
 
22
 
 
23
from bzrlib.bzrdir import (
 
24
    BzrDir,
 
25
    BzrDirFormat,
 
26
    )
 
27
from bzrlib.repository import (
 
28
    Repository,
 
29
    )
 
30
 
 
31
from bzrlib.plugins.git.fetch import (
 
32
    import_git_objects,
 
33
    BazaarObjectStore,
 
34
    )
 
35
from bzrlib.plugins.git.mapping import (
 
36
    default_mapping,
 
37
    )
 
38
from bzrlib.plugins.git.object_store import (
 
39
    get_object_store
 
40
    )
 
41
 
 
42
from dulwich.server import (
 
43
    Backend,
 
44
    )
 
45
from dulwich.pack import (
 
46
    Pack,
 
47
    PackData,
 
48
    write_pack_index_v2,
 
49
    )
35
50
 
36
51
 
37
52
class BzrBackend(Backend):
38
53
 
39
 
    def __init__(self, directory):
40
 
        self.directory = directory
 
54
    def __init__(self, transport):
 
55
        self.transport = transport
41
56
        self.mapping = default_mapping
42
57
 
43
58
    def get_refs(self):
44
59
        """ return a dict of all tags and branches in repository (and shas) """
45
60
        ret = {}
46
 
        repo_dir = BzrDir.open(self.directory)
47
 
        repo = repo_dir.open_repository()
48
 
        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]
 
61
        repo_dir = BzrDir.open_from_transport(self.transport)
 
62
        repo = repo_dir.find_repository()
 
63
        repo.lock_read()
 
64
        try:
 
65
            store = get_object_store(repo)
 
66
            branch = None
 
67
            for branch in repo.find_branches(using=True):
 
68
                #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
 
69
                #FIXME: Need to get branch path relative to its repository and use this instead of nick
 
70
                ret["refs/heads/"+branch.nick] = store._lookup_revision_sha1(branch.last_revision())
 
71
            if 'HEAD' not in ret and branch:
 
72
                ret['HEAD'] = store._lookup_revision_sha1(branch.last_revision())
 
73
        finally:
 
74
            repo.unlock()
55
75
        return ret
56
76
 
57
77
    def apply_pack(self, refs, read):
71
91
            for obj in pack.iterobjects():
72
92
                yield obj
73
93
 
74
 
        target = Repository.open(self.directory)
 
94
        target = Repository.open_from_transport(self.transport)
75
95
 
76
96
        target.lock_write()
77
97
        try:
86
106
        for oldsha, sha, ref in refs:
87
107
            if ref[:11] == 'refs/heads/':
88
108
                branch_nick = ref[11:]
 
109
                transport = self.transport.clone(branch_nick)
89
110
 
90
111
                try:
91
 
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
 
112
                    target_dir = BzrDir.open_from_transport(transport)
92
113
                except:
93
 
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
 
114
                    format = BzrDirFormat.get_default_format()
 
115
                    format.initialize_on_transport(transport)
94
116
 
95
117
                try:
96
118
                    target_branch = target_dir.open_branch()
102
124
 
103
125
    def fetch_objects(self, determine_wants, graph_walker, progress):
104
126
        """ yield git objects to send to client """
 
127
        bzrdir = BzrDir.open_from_transport(self.transport)
 
128
        repo = bzrdir.find_repository()
 
129
 
 
130
        # If this is a Git repository, just use the existing fetch_objects implementation.
 
131
        if getattr(repo, "fetch_objects", None) is not None:
 
132
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
 
133
 
105
134
        wants = determine_wants(self.get_refs())
106
 
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
107
 
        rev_done = set()
108
 
        obj_sent = set()
109
 
 
110
 
        repo = Repository.open(self.directory)
111
 
 
112
 
        objects = set()
113
 
 
114
135
        repo.lock_read()
115
 
        try:
116
 
            have = graph_walker.next()
117
 
            while have:
118
 
                rev_done.add(have)
119
 
                if repo.has_revision(self.mapping.revision_id_foregin_to_bzr(sha)):
120
 
                    graph_walker.ack(have)
121
 
                have = graph_walker.next()
122
 
 
123
 
            while commits_to_send:
124
 
                commit = commits_to_send.pop()
125
 
                if commit in rev_done:
126
 
                    continue
127
 
                rev_done.add(commit)
128
 
 
129
 
                rev = repo.get_revision(commit)
130
 
 
131
 
                commits_to_send.update([p for p in rev.parent_ids if not p in rev_done])
132
 
 
133
 
                for sha, obj, path in inventory_to_tree_and_blobs(repo, self.mapping, commit):
134
 
                    if sha not in obj_sent:
135
 
                        obj_sent.add(sha)
136
 
                        objects.add((obj, path))
137
 
 
138
 
                objects.add((mapping.export_commit(rev, sha), None))
139
 
 
140
 
        finally:
141
 
            repo.unlock()
142
 
 
143
 
        return (len(objects), iter(objects))
144
 
 
145
 
 
146
 
def inventory_to_tree_and_blobs(repo, mapping, revision_id):
147
 
    stack = []
148
 
    cur = ""
149
 
    tree = Tree()
150
 
 
151
 
    inv = repo.get_inventory(revision_id)
152
 
 
153
 
    for path, entry in inv.iter_entries():
154
 
        while stack and not path.startswith(cur):
155
 
            tree.serialize()
156
 
            sha = tree.sha().hexdigest()
157
 
            yield sha, tree, path
158
 
            t = (stat.S_IFDIR, splitpath(cur)[-1:][0].encode('UTF-8'), sha)
159
 
            cur, tree = stack.pop()
160
 
            tree.add(*t)
161
 
 
162
 
        if type(entry) == InventoryDirectory:
163
 
            stack.append((cur, tree))
164
 
            cur = path
165
 
            tree = Tree()
166
 
 
167
 
        if type(entry) == InventoryFile:
168
 
            #FIXME: We can make potentially make this Lazy to avoid shaing lots of stuff
169
 
            # and having all these objects in memory at once
170
 
            blob = Blob()
171
 
            _, blob._text = repo.iter_files_bytes([(entry.file_id, revision_id, path)]).next()
172
 
            sha = blob.sha().hexdigest()
173
 
            yield sha, blob, path
174
 
 
175
 
            name = splitpath(path)[-1:][0].encode('UTF-8')
176
 
            mode = stat.S_IFREG | 0644
177
 
            if entry.executable:
178
 
                mode |= 0111
179
 
            tree.add(mode, name, sha)
180
 
 
181
 
    while len(stack) > 1:
182
 
        tree.serialize()
183
 
        sha = tree.sha().hexdigest()
184
 
        yield sha, tree, path
185
 
        t = (stat.S_IFDIR, splitpath(cur)[-1:][0].encode('UTF-8'), sha)
186
 
        cur, tree = stack.pop()
187
 
        tree.add(*t)
188
 
 
189
 
    tree.serialize()
190
 
    yield tree.sha().hexdigest(), tree, path
191
 
 
 
136
        store = BazaarObjectStore(repo)
 
137
        have = store.find_common_revisions(graph_walker)
 
138
        missing_sha1s = store.find_missing_objects(have, wants, progress)
 
139
        return store.iter_shas(missing_sha1s)
 
140
 
 
141
 
 
142
def serve_git(transport, host=None, port=None, inet=False):
 
143
    backend = BzrBackend(transport)
 
144
 
 
145
    server = TCPGitServer(backend, 'localhost')
 
146
    server.serve_forever()