/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

Return mapping in revision_id_bzr_to_foreign() as required by the interface.

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, revision_to_commit, inventory_to_tree_and_blobs
 
23
from bzrlib.plugins.git.mapping import default_mapping
24
24
 
25
25
from dulwich.server import Backend
26
26
from dulwich.pack import Pack, PackData, write_pack_index_v2
45
45
        ret = {}
46
46
        repo_dir = BzrDir.open(self.directory)
47
47
        repo = repo_dir.open_repository()
48
 
        branch = None
49
48
        for branch in repo.find_branches(using=True):
50
 
            #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
51
49
            #FIXME: Need to get branch path relative to its repository and use this instead of nick
52
50
            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]
55
51
        return ret
56
52
 
57
53
    def apply_pack(self, refs, read):
102
98
 
103
99
    def fetch_objects(self, determine_wants, graph_walker, progress):
104
100
        """ 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
 
 
111
101
        wants = determine_wants(self.get_refs())
112
102
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
113
103
        rev_done = set()
114
104
        obj_sent = set()
115
105
 
 
106
        repo = Repository.open(self.directory)
 
107
 
116
108
        objects = set()
117
109
 
118
110
        repo.lock_read()
120
112
            have = graph_walker.next()
121
113
            while have:
122
114
                rev_done.add(have)
123
 
                if repo.has_revision(self.mapping.revision_id_foreign_to_bzr(sha)):
 
115
                if repo.has_revision(self.mapping.revision_id_foregin_to_bzr(sha)):
124
116
                    graph_walker.ack(have)
125
117
                have = graph_walker.next()
126
118
 
134
126
 
135
127
                commits_to_send.update([p for p in rev.parent_ids if not p in rev_done])
136
128
 
137
 
                for sha, obj, path in inventory_to_tree_and_blobs(repo, self.mapping, commit):
 
129
                for sha, obj in inventory_to_tree_and_blobs(repo, self.mapping, commit):
138
130
                    if sha not in obj_sent:
139
131
                        obj_sent.add(sha)
140
 
                        objects.add((obj, path))
 
132
                        objects.add(obj)
141
133
 
142
 
                objects.add((revision_to_commit(rev, sha, self.mapping.revision_id_bzr_to_foreign), None))
 
134
                objects.add(revision_to_commit(rev, self.mapping, sha))
143
135
 
144
136
        finally:
145
137
            repo.unlock()
146
138
 
147
139
        return (len(objects), iter(objects))
148
140
 
 
141
 
 
142
def revision_to_commit(rev, mapping, tree_sha):
 
143
    """
 
144
    Turn a Bazaar revision in to a Git commit
 
145
    :param tree_sha: HACK parameter (until we can retrieve this from the mapping)
 
146
    :return dulwich.objects.Commit represent the revision:
 
147
    """
 
148
    commit = Commit()
 
149
    commit._tree = tree_sha
 
150
    for p in rev.parent_ids:
 
151
        commit._parents.append(mapping.revision_id_bzr_to_foreign(p)[0])
 
152
    commit._message = rev.message
 
153
    commit._committer = rev.committer
 
154
    if 'author' in rev.properties:
 
155
        commit._author = rev.properties['author']
 
156
    else:
 
157
        commit._author = rev.committer
 
158
    commit._commit_time = long(rev.timestamp)
 
159
    commit.serialize()
 
160
    return commit
 
161
 
 
162
def inventory_to_tree_and_blobs(repo, mapping, revision_id):
 
163
    stack = []
 
164
    cur = ""
 
165
    tree = Tree()
 
166
 
 
167
    inv = repo.get_inventory(revision_id)
 
168
 
 
169
    for path, entry in inv.iter_entries():
 
170
        while stack and not path.startswith(cur):
 
171
            tree.serialize()
 
172
            sha = tree.sha().hexdigest()
 
173
            yield sha, tree
 
174
            t = (stat.S_IFDIR, splitpath(cur)[-1:][0].encode('UTF-8'), sha)
 
175
            cur, tree = stack.pop()
 
176
            tree.add(*t)
 
177
 
 
178
        if type(entry) == InventoryDirectory:
 
179
            stack.append((cur, tree))
 
180
            cur = path
 
181
            tree = Tree()
 
182
 
 
183
        if type(entry) == InventoryFile:
 
184
            #FIXME: We can make potentially make this Lazy to avoid shaing lots of stuff
 
185
            # and having all these objects in memory at once
 
186
            blob = Blob()
 
187
            _, blob._text = repo.iter_files_bytes([(entry.file_id, revision_id, path)]).next()
 
188
            sha = blob.sha().hexdigest()
 
189
            yield sha, blob
 
190
 
 
191
            name = splitpath(path)[-1:][0].encode('UTF-8')
 
192
            mode = stat.S_IFREG | 0644
 
193
            if entry.executable:
 
194
                mode |= 0111
 
195
            tree.add(mode, name, sha)
 
196
 
 
197
    while len(stack) > 1:
 
198
        tree.serialize()
 
199
        sha = tree.sha().hexdigest()
 
200
        yield sha, tree
 
201
        t = (stat.S_IFDIR, splitpath(cur)[-1:][0].encode('UTF-8'), sha)
 
202
        cur, tree = stack.pop()
 
203
        tree.add(*t)
 
204
 
 
205
    tree.serialize()
 
206
    yield tree.sha().hexdigest(), tree
 
207