/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: John Carr
  • Date: 2009-01-13 20:26:54 UTC
  • mto: (0.217.53 git-serve)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: john.carr@unrouted.co.uk-20090113202654-9hsels0a9r35o7u0
Rename upload-pack and receive-pack so they don't clash with the Git versions

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
# FIXME: Remove this in favor of something in the mapping...
 
32
_mode = -1
 
33
def get_umask():
 
34
    global _mode
 
35
    if _mode == -1:
 
36
        _mode = os.umask(0)
 
37
        os.umask(_mode)
 
38
    return _mode
18
39
 
19
40
class BzrBackend(Backend):
20
41
 
21
42
    def __init__(self, directory):
22
43
        self.directory = directory
 
44
        self.mapping = default_mapping
23
45
 
24
46
    def get_refs(self):
25
47
        """ return a dict of all tags and branches in repository (and shas) """
26
 
        return {}
 
48
        ret = {}
 
49
        repo_dir = BzrDir.open(self.directory)
 
50
        repo = repo_dir.open_repository()
 
51
        for branch in repo.find_branches(using=True):
 
52
            #FIXME: Need to get branch path relative to its repository and use this instead of nick
 
53
            ret["refs/heads/"+branch.nick] = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())
 
54
        return ret
27
55
 
28
56
    def apply_pack(self, refs, read):
29
57
        """ apply pack from client to current repository """
30
 
        self.read()
 
58
 
 
59
        fd, path = tempfile.mkstemp(suffix=".pack")
 
60
        f = os.fdopen(fd, 'w')
 
61
        f.write(read())
 
62
        f.close()
 
63
 
 
64
        p = PackData(path)
 
65
        entries = p.sorted_entries()
 
66
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
 
67
 
 
68
        def get_objects():
 
69
            pack = Pack(path[:-5])
 
70
            for obj in pack.iterobjects():
 
71
                yield obj
 
72
 
 
73
        target = Repository.open(self.directory)
 
74
 
 
75
        target.lock_write()
 
76
        try:
 
77
            target.start_write_group()
 
78
            try:
 
79
                import_git_objects(target, self.mapping, iter(get_objects()))
 
80
            finally:
 
81
                target.commit_write_group()
 
82
        finally:
 
83
            target.unlock()
 
84
 
 
85
        for oldsha, sha, ref in refs:
 
86
            if ref[:11] == 'refs/heads/':
 
87
                branch_nick = ref[11:]
 
88
 
 
89
                try:
 
90
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
 
91
                except:
 
92
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
 
93
 
 
94
                try:
 
95
                    target_branch = target_dir.open_branch()
 
96
                except:
 
97
                    target_branch = target_dir.create_branch()
 
98
 
 
99
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
100
                target_branch.generate_revision_history(rev_id)
31
101
 
32
102
    def fetch_objects(self, determine_wants, graph_walker, progress):
33
103
        """ yield git objects to send to client """
 
104
        wants = determine_wants(self.get_refs())
 
105
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
 
106
        rev_done = set()
 
107
        obj_sent = set()
 
108
 
 
109
        repo = Repository.open(self.directory)
 
110
 
 
111
        repo.lock_read()
 
112
        try:
 
113
            have = graph_walker.next()
 
114
            while have:
 
115
                rev_done.add(have)
 
116
                if repo.has_revision(self.mapping.revision_id_foregin_to_bzr(sha)):
 
117
                    graph_walker.ack(have)
 
118
                have = graph_walker.next()
 
119
 
 
120
            while commits_to_send:
 
121
                commit = commits_to_send.pop()
 
122
                if commit in rev_done:
 
123
                    continue
 
124
                rev_done.add(commit)
 
125
 
 
126
                rev = repo.get_revision(commit)
 
127
 
 
128
                commits_to_send.update([p for p in rev.parent_ids if not p in rev_done])
 
129
 
 
130
                for sha, obj in inventory_to_tree_and_blobs(repo, self.mapping, commit):
 
131
                    if sha not in obj_sent:
 
132
                        obj_sent.add(sha)
 
133
                        yield obj
 
134
 
 
135
                yield revision_to_commit(rev, self.mapping, sha)
 
136
 
 
137
        finally:
 
138
            repo.unlock()
 
139
 
 
140
 
 
141
def revision_to_commit(rev, mapping, tree_sha):
 
142
    """
 
143
    Turn a Bazaar revision in to a Git commit
 
144
    :param tree_sha: HACK parameter (until we can retrieve this from the mapping)
 
145
    :return dulwich.objects.Commit represent the revision:
 
146
    """
 
147
    commit = Commit()
 
148
    commit._tree = tree_sha
 
149
    for p in rev.parent_ids:
 
150
        commit._parents.append(mapping.revision_id_bzr_to_foreign(p))
 
151
    commit._message = rev.message
 
152
    commit._committer = rev.committer
 
153
    if 'author' in rev.properties:
 
154
        commit._author = rev.properties['author']
 
155
    else:
 
156
        commit._author = rev.committer
 
157
    commit._commit_time = rev.timestamp
 
158
    commit.serialize()
 
159
    print commit.sha().hexdigest()
 
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 = (get_umask(), 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 = get_umask()
 
193
            tree.add(mode, name, sha)
 
194
 
 
195
    while len(stack) > 1:
 
196
        tree.serialize()
 
197
        sha = tree.sha().hexdigest()
 
198
        yield sha, tree
 
199
        t = (get_umask(), splitpath(cur)[-1:][0].encode('UTF-8'), sha)
 
200
        cur, tree = stack.pop()
 
201
        tree.add(*t)
 
202
 
 
203
    tree.serialize()
 
204
    yield tree.sha().hexdigest(), tree
34
205