/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

Add more tests for fetch code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
20
20
from bzrlib.osutils import splitpath
21
21
 
22
22
from bzrlib.plugins.git.fetch import import_git_objects
23
 
from bzrlib.plugins.git.mapping import default_mapping
 
23
from bzrlib.plugins.git.mapping import default_mapping, revision_to_commit, inventory_to_tree_and_blobs
24
24
 
25
25
from dulwich.server import Backend
26
26
from dulwich.pack import Pack, PackData, write_pack_index_v2
102
102
 
103
103
    def fetch_objects(self, determine_wants, graph_walker, progress):
104
104
        """ yield git objects to send to client """
 
105
        repo = Repository.open(self.directory)
 
106
 
 
107
        # If this is a Git repository, just use the existing fetch_objects implementation.
 
108
        if getattr(repo, "fetch_objects", None) is None:
 
109
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
 
110
 
105
111
        wants = determine_wants(self.get_refs())
106
112
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
107
113
        rev_done = set()
108
114
        obj_sent = set()
109
115
 
110
 
        repo = Repository.open(self.directory)
111
 
 
112
116
        objects = set()
113
117
 
114
118
        repo.lock_read()
116
120
            have = graph_walker.next()
117
121
            while have:
118
122
                rev_done.add(have)
119
 
                if repo.has_revision(self.mapping.revision_id_foregin_to_bzr(sha)):
 
123
                if repo.has_revision(self.mapping.revision_id_foreign_to_bzr(sha)):
120
124
                    graph_walker.ack(have)
121
125
                have = graph_walker.next()
122
126
 
135
139
                        obj_sent.add(sha)
136
140
                        objects.add((obj, path))
137
141
 
138
 
                objects.add((mapping.export_commit(rev, sha), None))
 
142
                objects.add((revision_to_commit(rev, sha, self.mapping.revision_id_bzr_to_foreign), None))
139
143
 
140
144
        finally:
141
145
            repo.unlock()
142
146
 
143
147
        return (len(objects), iter(objects))
144
148
 
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