/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 simple tests and docstrings for GraphWalker.

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
18
 
import tempfile
19
 
 
20
 
from dulwich.server import TCPGitServer
21
 
import os
22
 
 
23
 
from bzrlib.bzrdir import (
24
 
    BzrDir,
25
 
    BzrDirFormat,
26
 
    )
27
 
from bzrlib.repository import (
28
 
    Repository,
29
 
    )
30
 
 
31
 
from bzrlib.plugins.git.fetch import (
32
 
    import_git_objects,
33
 
    BazaarObjectStore,
34
 
    )
35
 
from bzrlib.plugins.git.mapping import (
36
 
    default_mapping,
37
 
    )
38
 
from bzrlib.plugins.git.object_store import (
39
 
    get_object_store
40
 
    )
41
 
 
42
 
from dulwich.server import (
43
 
    Backend,
44
 
    )
45
 
from dulwich.pack import (
46
 
    Pack,
47
 
    PackData,
48
 
    write_pack_index_v2,
49
 
    )
 
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
 
 
31
import stat
 
32
S_IFGITLINK = 0160000
 
33
 
 
34
#S_IFREG | 0664 # *Might* see this; would fail fsck --strict
50
35
 
51
36
 
52
37
class BzrBackend(Backend):
53
38
 
54
 
    def __init__(self, transport):
55
 
        self.transport = transport
 
39
    def __init__(self, directory):
 
40
        self.directory = directory
56
41
        self.mapping = default_mapping
57
42
 
58
43
    def get_refs(self):
59
44
        """ return a dict of all tags and branches in repository (and shas) """
60
45
        ret = {}
61
 
        repo_dir = BzrDir.open_from_transport(self.transport)
62
 
        repo = repo_dir.find_repository()
63
 
        repo.lock_read()
64
 
        try:
65
 
            store = get_object_store(repo)
66
 
            branch = None
67
 
            for branch in repo.find_branches(using=True):
68
 
                #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
69
 
                #FIXME: Need to get branch path relative to its repository and use this instead of nick
70
 
                ret["refs/heads/"+branch.nick] = store._lookup_revision_sha1(branch.last_revision())
71
 
            if 'HEAD' not in ret and branch:
72
 
                ret['HEAD'] = store._lookup_revision_sha1(branch.last_revision())
73
 
        finally:
74
 
            repo.unlock()
 
46
        repo_dir = BzrDir.open(self.directory)
 
47
        repo = repo_dir.open_repository()
 
48
        for branch in repo.find_branches(using=True):
 
49
            #FIXME: Need to get branch path relative to its repository and use this instead of nick
 
50
            ret["refs/heads/"+branch.nick] = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())[0]
75
51
        return ret
76
52
 
77
53
    def apply_pack(self, refs, read):
91
67
            for obj in pack.iterobjects():
92
68
                yield obj
93
69
 
94
 
        target = Repository.open_from_transport(self.transport)
 
70
        target = Repository.open(self.directory)
95
71
 
96
72
        target.lock_write()
97
73
        try:
106
82
        for oldsha, sha, ref in refs:
107
83
            if ref[:11] == 'refs/heads/':
108
84
                branch_nick = ref[11:]
109
 
                transport = self.transport.clone(branch_nick)
110
85
 
111
86
                try:
112
 
                    target_dir = BzrDir.open_from_transport(transport)
 
87
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
113
88
                except:
114
 
                    format = BzrDirFormat.get_default_format()
115
 
                    format.initialize_on_transport(transport)
 
89
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
116
90
 
117
91
                try:
118
92
                    target_branch = target_dir.open_branch()
124
98
 
125
99
    def fetch_objects(self, determine_wants, graph_walker, progress):
126
100
        """ yield git objects to send to client """
127
 
        bzrdir = BzrDir.open_from_transport(self.transport)
128
 
        repo = bzrdir.find_repository()
129
 
 
130
 
        # If this is a Git repository, just use the existing fetch_objects implementation.
131
 
        if getattr(repo, "fetch_objects", None) is not None:
132
 
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
133
 
 
134
101
        wants = determine_wants(self.get_refs())
 
102
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
 
103
        rev_done = set()
 
104
        obj_sent = set()
 
105
 
 
106
        repo = Repository.open(self.directory)
 
107
 
 
108
        objects = set()
 
109
 
135
110
        repo.lock_read()
136
 
        store = BazaarObjectStore(repo)
137
 
        have = store.find_common_revisions(graph_walker)
138
 
        missing_sha1s = store.find_missing_objects(have, wants, progress)
139
 
        return store.iter_shas(missing_sha1s)
140
 
 
141
 
 
142
 
def serve_git(transport, host=None, port=None, inet=False):
143
 
    backend = BzrBackend(transport)
144
 
 
145
 
    server = TCPGitServer(backend, 'localhost')
146
 
    server.serve_forever()
 
111
        try:
 
112
            have = graph_walker.next()
 
113
            while have:
 
114
                rev_done.add(have)
 
115
                if repo.has_revision(self.mapping.revision_id_foregin_to_bzr(sha)):
 
116
                    graph_walker.ack(have)
 
117
                have = graph_walker.next()
 
118
 
 
119
            while commits_to_send:
 
120
                commit = commits_to_send.pop()
 
121
                if commit in rev_done:
 
122
                    continue
 
123
                rev_done.add(commit)
 
124
 
 
125
                rev = repo.get_revision(commit)
 
126
 
 
127
                commits_to_send.update([p for p in rev.parent_ids if not p in rev_done])
 
128
 
 
129
                for sha, obj in inventory_to_tree_and_blobs(repo, self.mapping, commit):
 
130
                    if sha not in obj_sent:
 
131
                        obj_sent.add(sha)
 
132
                        objects.add(obj)
 
133
 
 
134
                objects.add(revision_to_commit(rev, self.mapping, sha))
 
135
 
 
136
        finally:
 
137
            repo.unlock()
 
138
 
 
139
        return (len(objects), iter(objects))
 
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