/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
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
 
17
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
 
35
 
18
36
 
19
37
class BzrBackend(Backend):
20
38
 
21
39
    def __init__(self, directory):
22
40
        self.directory = directory
 
41
        self.mapping = default_mapping
23
42
 
24
43
    def get_refs(self):
25
44
        """ return a dict of all tags and branches in repository (and shas) """
26
 
        return {}
 
45
        ret = {}
 
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]
 
51
        return ret
27
52
 
28
53
    def apply_pack(self, refs, read):
29
54
        """ apply pack from client to current repository """
30
 
        self.read()
 
55
 
 
56
        fd, path = tempfile.mkstemp(suffix=".pack")
 
57
        f = os.fdopen(fd, 'w')
 
58
        f.write(read())
 
59
        f.close()
 
60
 
 
61
        p = PackData(path)
 
62
        entries = p.sorted_entries()
 
63
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
 
64
 
 
65
        def get_objects():
 
66
            pack = Pack(path[:-5])
 
67
            for obj in pack.iterobjects():
 
68
                yield obj
 
69
 
 
70
        target = Repository.open(self.directory)
 
71
 
 
72
        target.lock_write()
 
73
        try:
 
74
            target.start_write_group()
 
75
            try:
 
76
                import_git_objects(target, self.mapping, iter(get_objects()))
 
77
            finally:
 
78
                target.commit_write_group()
 
79
        finally:
 
80
            target.unlock()
 
81
 
 
82
        for oldsha, sha, ref in refs:
 
83
            if ref[:11] == 'refs/heads/':
 
84
                branch_nick = ref[11:]
 
85
 
 
86
                try:
 
87
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
 
88
                except:
 
89
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
 
90
 
 
91
                try:
 
92
                    target_branch = target_dir.open_branch()
 
93
                except:
 
94
                    target_branch = target_dir.create_branch()
 
95
 
 
96
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
97
                target_branch.generate_revision_history(rev_id)
31
98
 
32
99
    def fetch_objects(self, determine_wants, graph_walker, progress):
33
100
        """ yield git objects to send to client """
 
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
 
 
110
        repo.lock_read()
 
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
34
207