/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

Rely less on command-line 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
 
 
 
17
import os
31
18
import stat
 
19
import tempfile
 
20
 
 
21
from bzrlib.bzrdir import (
 
22
    BzrDir,
 
23
    )
 
24
from bzrlib.inventory import (
 
25
    InventoryDirectory,
 
26
    InventoryFile,
 
27
    )
 
28
from bzrlib.osutils import (
 
29
    splitpath,
 
30
    )
 
31
from bzrlib.repository import (
 
32
    Repository,
 
33
    )
 
34
 
 
35
from bzrlib.plugins.git.fetch import (
 
36
    import_git_objects,
 
37
    )
 
38
from bzrlib.plugins.git.mapping import (
 
39
    default_mapping,
 
40
    inventory_to_tree_and_blobs,
 
41
    revision_to_commit,
 
42
    )
 
43
 
 
44
from dulwich.server import (
 
45
    Backend,
 
46
    )
 
47
from dulwich.pack import (
 
48
    Pack,
 
49
    PackData,
 
50
    write_pack_index_v2,
 
51
    )
 
52
from dulwich.objects import (
 
53
    Blob,
 
54
    Commit,
 
55
    ShaFile,
 
56
    Tree,
 
57
    )
 
58
 
32
59
S_IFGITLINK = 0160000
33
60
 
34
61
#S_IFREG | 0664 # *Might* see this; would fail fsck --strict
102
129
 
103
130
    def fetch_objects(self, determine_wants, graph_walker, progress):
104
131
        """ yield git objects to send to client """
 
132
        repo = Repository.open(self.directory)
 
133
 
 
134
        # If this is a Git repository, just use the existing fetch_objects implementation.
 
135
        if getattr(repo, "fetch_objects", None) is not None:
 
136
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
 
137
 
105
138
        wants = determine_wants(self.get_refs())
106
139
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
107
140
        rev_done = set()
108
141
        obj_sent = set()
109
142
 
110
 
        repo = Repository.open(self.directory)
111
 
 
112
143
        objects = set()
113
144
 
114
145
        repo.lock_read()
116
147
            have = graph_walker.next()
117
148
            while have:
118
149
                rev_done.add(have)
119
 
                if repo.has_revision(self.mapping.revision_id_foregin_to_bzr(sha)):
 
150
                if repo.has_revision(self.mapping.revision_id_foreign_to_bzr(sha)):
120
151
                    graph_walker.ack(have)
121
152
                have = graph_walker.next()
122
153
 
130
161
 
131
162
                commits_to_send.update([p for p in rev.parent_ids if not p in rev_done])
132
163
 
133
 
                for sha, obj, path in inventory_to_tree_and_blobs(repo, self.mapping, commit):
 
164
                for sha, obj, path in inventory_to_tree_and_blobs(repo.get_inventory(commit), repo.texts, self.mapping):
134
165
                    if sha not in obj_sent:
135
166
                        obj_sent.add(sha)
136
167
                        objects.add((obj, path))
137
168
 
138
 
                objects.add((mapping.export_commit(rev, sha), None))
 
169
                objects.add((revision_to_commit(rev, sha, self.mapping.revision_id_bzr_to_foreign), None))
139
170
 
140
171
        finally:
141
172
            repo.unlock()
142
173
 
143
174
        return (len(objects), iter(objects))
144
175
 
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