/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 basic infrastructure for dpush.

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
 
import os
 
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
 
18
31
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.converter import (
36
 
    BazaarObjectStore,
37
 
    )
38
 
from bzrlib.plugins.git.fetch import (
39
 
    import_git_objects,
40
 
    )
41
 
from bzrlib.plugins.git.mapping import (
42
 
    default_mapping,
43
 
    inventory_to_tree_and_blobs,
44
 
    revision_to_commit,
45
 
    )
46
 
 
47
 
from dulwich.server import (
48
 
    Backend,
49
 
    )
50
 
from dulwich.pack import (
51
 
    Pack,
52
 
    PackData,
53
 
    write_pack_index_v2,
54
 
    )
55
 
from dulwich.objects import (
56
 
    Blob,
57
 
    Commit,
58
 
    ShaFile,
59
 
    Tree,
60
 
    )
61
 
 
62
32
S_IFGITLINK = 0160000
63
33
 
64
34
#S_IFREG | 0664 # *Might* see this; would fail fsck --strict
79
49
        for branch in repo.find_branches(using=True):
80
50
            #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
81
51
            #FIXME: Need to get branch path relative to its repository and use this instead of nick
82
 
            rev, mapping = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())
83
 
            ret["refs/heads/"+branch.nick] = rev
 
52
            ret["refs/heads/"+branch.nick] = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())[0]
84
53
        if 'HEAD' not in ret and branch:
85
 
            rev, mapping = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())
86
 
            ret['HEAD'] = rev
 
54
            ret['HEAD'] = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())[0]
87
55
        return ret
88
56
 
89
57
    def apply_pack(self, refs, read):
134
102
 
135
103
    def fetch_objects(self, determine_wants, graph_walker, progress):
136
104
        """ yield git objects to send to client """
137
 
        repo = Repository.open(self.directory)
138
 
 
139
 
        # If this is a Git repository, just use the existing fetch_objects implementation.
140
 
        if getattr(repo, "fetch_objects", None) is not None:
141
 
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
142
 
        store = BazaarObjectStore(repo)
143
 
 
144
105
        wants = determine_wants(self.get_refs())
145
106
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
146
107
        rev_done = set()
147
108
        obj_sent = set()
148
109
 
 
110
        repo = Repository.open(self.directory)
 
111
 
149
112
        objects = set()
150
113
 
151
114
        repo.lock_read()
153
116
            have = graph_walker.next()
154
117
            while have:
155
118
                rev_done.add(have)
156
 
                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)):
157
120
                    graph_walker.ack(have)
158
121
                have = graph_walker.next()
159
122
 
167
130
 
168
131
                commits_to_send.update([p for p in rev.parent_ids if not p in rev_done])
169
132
 
170
 
                for sha, obj, path in inventory_to_tree_and_blobs(repo.get_inventory(commit), repo.texts, self.mapping):
 
133
                for sha, obj, path in inventory_to_tree_and_blobs(repo, self.mapping, commit):
171
134
                    if sha not in obj_sent:
172
135
                        obj_sent.add(sha)
173
136
                        objects.add((obj, path))
174
137
 
175
 
                objects.add((revision_to_commit(rev, sha, store._lookup_revision_sha1), None))
 
138
                objects.add((mapping.export_commit(rev, sha), None))
176
139
 
177
140
        finally:
178
141
            repo.unlock()
179
142
 
180
143
        return (len(objects), iter(objects))
181
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