/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

Partially fix pull.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
1
 
# Copyright (C) 2008 Jelmer Vernooij
2
 
# Copyright (C) 2008 John Carr
3
1
# Copyright (C) 2008 Canonical Ltd
4
2
#
5
3
# This program is free software; you can redistribute it and/or modify
16
14
# along with this program; if not, write to the Free Software
17
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
16
 
19
 
import os
20
 
import tempfile
21
 
 
22
 
from dulwich.server import TCPGitServer
23
 
 
24
 
from bzrlib.bzrdir import (
25
 
    BzrDir,
26
 
    BzrDirFormat,
27
 
    )
28
 
from bzrlib.repository import (
29
 
    Repository,
30
 
    )
31
 
 
32
 
from bzrlib.plugins.git.fetch import (
33
 
    import_git_objects,
34
 
    BazaarObjectStore,
35
 
    )
36
 
from bzrlib.plugins.git.mapping import (
37
 
    default_mapping,
38
 
    )
39
 
from bzrlib.plugins.git.object_store import (
40
 
    get_object_store
41
 
    )
42
 
 
43
 
from dulwich.server import (
44
 
    Backend,
45
 
    )
46
 
from dulwich.pack import (
47
 
    PackData,
48
 
    write_pack_index_v2,
49
 
    )
50
 
from dulwich.objects import (
51
 
    ShaFile,
52
 
    hex_to_sha,
53
 
    )
 
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, revision_to_commit, inventory_to_tree_and_blobs
 
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
 
35
 
54
36
 
55
37
class BzrBackend(Backend):
56
38
 
57
 
    def __init__(self, transport):
58
 
        self.transport = transport
 
39
    def __init__(self, directory):
 
40
        self.directory = directory
59
41
        self.mapping = default_mapping
60
42
 
61
43
    def get_refs(self):
62
44
        """ return a dict of all tags and branches in repository (and shas) """
63
45
        ret = {}
64
 
        repo_dir = BzrDir.open_from_transport(self.transport)
65
 
        repo = repo_dir.find_repository()
66
 
        repo.lock_read()
67
 
        try:
68
 
            store = get_object_store(repo)
69
 
            branch = None
70
 
            for branch in repo.find_branches(using=True):
71
 
                #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
72
 
                #FIXME: Need to get branch path relative to its repository and use this instead of nick
73
 
                ret["refs/heads/"+branch.nick] = store._lookup_revision_sha1(branch.last_revision())
74
 
            if 'HEAD' not in ret and branch:
75
 
                ret['HEAD'] = store._lookup_revision_sha1(branch.last_revision())
76
 
        finally:
77
 
            repo.unlock()
 
46
        repo_dir = BzrDir.open(self.directory)
 
47
        repo = repo_dir.open_repository()
 
48
        branch = None
 
49
        for branch in repo.find_branches(using=True):
 
50
            #FIXME: Look for 'master' or 'trunk' in here, and set HEAD accordingly...
 
51
            #FIXME: Need to get branch path relative to its repository and use this instead of nick
 
52
            ret["refs/heads/"+branch.nick] = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())[0]
 
53
        if 'HEAD' not in ret and branch:
 
54
            ret['HEAD'] = self.mapping.revision_id_bzr_to_foreign(branch.last_revision())[0]
78
55
        return ret
79
56
 
80
57
    def apply_pack(self, refs, read):
81
 
        """apply pack from client to current repository"""
 
58
        """ apply pack from client to current repository """
82
59
 
83
60
        fd, path = tempfile.mkstemp(suffix=".pack")
84
61
        f = os.fdopen(fd, 'w')
87
64
 
88
65
        p = PackData(path)
89
66
        entries = p.sorted_entries()
90
 
        heads = []
91
 
        for e in entries:
92
 
            sha = e[0]
93
 
            offset = e[1]
94
 
            t, o = p.get_object_at (offset)
95
 
            if t == 1 or t == 4:
96
 
                heads.append(sha)
97
67
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
98
68
 
99
 
        repo_dir = BzrDir.open_from_transport(self.transport)
100
 
        target = repo_dir.find_repository()
 
69
        def get_objects():
 
70
            pack = Pack(path[:-5])
 
71
            for obj in pack.iterobjects():
 
72
                yield obj
101
73
 
102
 
        objects = {}
103
 
        for tup in p.iterobjects():
104
 
            obj_type, obj = p.get_object_at (tup[0])
105
 
            if obj_type in range(1, 4):
106
 
                sf = ShaFile.from_raw_string (obj_type, obj)
107
 
                objects[hex_to_sha(sf.id)] = sf
 
74
        target = Repository.open(self.directory)
108
75
 
109
76
        target.lock_write()
110
77
        try:
111
78
            target.start_write_group()
112
79
            try:
113
 
                import_git_objects(target, self.mapping, objects,
114
 
                                   BazaarObjectStore (target, self.mapping),
115
 
                                   heads)
116
 
            except:
117
 
                target.abort_write_group()
118
 
                raise
119
 
            else:
 
80
                import_git_objects(target, self.mapping, iter(get_objects()))
 
81
            finally:
120
82
                target.commit_write_group()
121
83
        finally:
122
84
            target.unlock()
124
86
        for oldsha, sha, ref in refs:
125
87
            if ref[:11] == 'refs/heads/':
126
88
                branch_nick = ref[11:]
127
 
                transport = self.transport.clone(branch_nick)
128
89
 
129
90
                try:
130
 
                    target_dir = BzrDir.open_from_transport(transport)
 
91
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
131
92
                except:
132
 
                    format = BzrDirFormat.get_default_format()
133
 
                    format.initialize_on_transport(transport)
 
93
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
134
94
 
135
95
                try:
136
96
                    target_branch = target_dir.open_branch()
142
102
 
143
103
    def fetch_objects(self, determine_wants, graph_walker, progress):
144
104
        """ yield git objects to send to client """
145
 
        bzrdir = BzrDir.open_from_transport(self.transport)
146
 
        repo = bzrdir.find_repository()
 
105
        repo = Repository.open(self.directory)
147
106
 
148
107
        # If this is a Git repository, just use the existing fetch_objects implementation.
149
 
        if getattr(repo, "fetch_objects", None) is not None:
150
 
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)[0]
 
108
        if getattr(repo, "fetch_objects", None) is None:
 
109
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
151
110
 
152
111
        wants = determine_wants(self.get_refs())
153
 
        graph_walker.reset()
 
112
        commits_to_send = set([self.mapping.revision_id_foreign_to_bzr(w) for w in wants])
 
113
        rev_done = set()
 
114
        obj_sent = set()
 
115
 
 
116
        objects = set()
 
117
 
154
118
        repo.lock_read()
155
 
        store = BazaarObjectStore(repo)
156
 
        have = store.find_common_revisions(graph_walker)
157
 
        missing_sha1s = store.find_missing_objects(have, wants, progress)
158
 
        return store.iter_shas(missing_sha1s)
159
 
 
160
 
 
161
 
def serve_git(transport, host=None, port=None, inet=False):
162
 
    backend = BzrBackend(transport)
163
 
 
164
 
    if host is None:
165
 
        host = 'localhost'
166
 
    if port:
167
 
        server = TCPGitServer(backend, host, port)
168
 
    else:
169
 
        server = TCPGitServer(backend, host)
170
 
    server.serve_forever()
 
119
        try:
 
120
            have = graph_walker.next()
 
121
            while have:
 
122
                rev_done.add(have)
 
123
                if repo.has_revision(self.mapping.revision_id_foreign_to_bzr(sha)):
 
124
                    graph_walker.ack(have)
 
125
                have = graph_walker.next()
 
126
 
 
127
            while commits_to_send:
 
128
                commit = commits_to_send.pop()
 
129
                if commit in rev_done:
 
130
                    continue
 
131
                rev_done.add(commit)
 
132
 
 
133
                rev = repo.get_revision(commit)
 
134
 
 
135
                commits_to_send.update([p for p in rev.parent_ids if not p in rev_done])
 
136
 
 
137
                for sha, obj, path in inventory_to_tree_and_blobs(repo, self.mapping, commit):
 
138
                    if sha not in obj_sent:
 
139
                        obj_sent.add(sha)
 
140
                        objects.add((obj, path))
 
141
 
 
142
                objects.add((revision_to_commit(rev, sha, self.mapping.revision_id_bzr_to_foreign), None))
 
143
 
 
144
        finally:
 
145
            repo.unlock()
 
146
 
 
147
        return (len(objects), iter(objects))
 
148