/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

  • Committer: Alexander Belchenko
  • Date: 2009-01-30 14:58:20 UTC
  • mto: (0.200.215 dulwich)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: bialix@ukr.net-20090130145820-gnmbyvgw1ngw39zv
bzr.exe support: allow import of dulwich from _lib subdirectory

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
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
 
 
111
105
        wants = determine_wants(self.get_refs())
112
106
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
113
107
        rev_done = set()
114
108
        obj_sent = set()
115
109
 
 
110
        repo = Repository.open(self.directory)
 
111
 
116
112
        objects = set()
117
113
 
118
114
        repo.lock_read()
120
116
            have = graph_walker.next()
121
117
            while have:
122
118
                rev_done.add(have)
123
 
                if repo.has_revision(self.mapping.revision_id_foreign_to_bzr(sha)):
 
119
                if repo.has_revision(self.mapping.revision_id_foregin_to_bzr(sha)):
124
120
                    graph_walker.ack(have)
125
121
                have = graph_walker.next()
126
122
 
139
135
                        obj_sent.add(sha)
140
136
                        objects.add((obj, path))
141
137
 
142
 
                objects.add((revision_to_commit(rev, sha, self.mapping.revision_id_bzr_to_foreign), None))
 
138
                objects.add((mapping.export_commit(rev, sha), None))
143
139
 
144
140
        finally:
145
141
            repo.unlock()
146
142
 
147
143
        return (len(objects), iter(objects))
148
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