/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

Fix tests.

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
 
from dulwich.server import TCPGitServer
20
 
 
21
 
from bzrlib.bzrdir import (
22
 
    BzrDir,
23
 
    )
24
 
 
25
 
from bzrlib.plugins.git.mapping import (
26
 
    default_mapping,
27
 
    )
28
 
from bzrlib.plugins.git.object_store import (
29
 
    get_object_store
30
 
    )
31
 
from bzrlib.plugins.git.refs import (
32
 
    BazaarRefsContainer,
33
 
    )
34
 
 
35
 
from dulwich.server import (
36
 
    Backend,
37
 
    BackendRepo,
38
 
    )
 
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
 
39
36
 
40
37
class BzrBackend(Backend):
41
 
    """A git serve backend that can use a Bazaar repository."""
42
38
 
43
 
    def __init__(self, transport):
44
 
        self.transport = transport
 
39
    def __init__(self, directory):
 
40
        self.directory = directory
45
41
        self.mapping = default_mapping
46
42
 
47
 
    def open_repository(self, path):
48
 
        # FIXME: More secure path sanitization
49
 
        return BzrBackendRepo(self.transport.clone(path.lstrip("/")),
50
 
            self.mapping)
51
 
 
52
 
 
53
 
class BzrBackendRepo(BackendRepo):
54
 
 
55
 
    def __init__(self, transport, mapping):
56
 
        self.transport = transport
57
 
        self.mapping = mapping
58
 
        self.repo_dir = BzrDir.open_from_transport(self.transport)
59
 
        self.repo = self.repo_dir.find_repository()
60
 
        self.object_store = get_object_store(self.repo)
61
 
        self.refs = BazaarRefsContainer(self.repo_dir, self.object_store)
62
 
        self._refs = self.refs.as_dict() # Much faster for now..
63
 
 
64
43
    def get_refs(self):
65
 
        return self._refs
66
 
 
67
 
    def get_peeled(self, name):
68
 
        return self.get_refs()[name]
69
 
 
70
 
    def fetch_objects(self, determine_wants, graph_walker, progress,
71
 
        get_tagged=None):
 
44
        """ return a dict of all tags and branches in repository (and shas) """
 
45
        ret = {}
 
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]
 
55
        return ret
 
56
 
 
57
    def apply_pack(self, refs, read):
 
58
        """ apply pack from client to current repository """
 
59
 
 
60
        fd, path = tempfile.mkstemp(suffix=".pack")
 
61
        f = os.fdopen(fd, 'w')
 
62
        f.write(read())
 
63
        f.close()
 
64
 
 
65
        p = PackData(path)
 
66
        entries = p.sorted_entries()
 
67
        write_pack_index_v2(path[:-5]+".idx", entries, p.calculate_checksum())
 
68
 
 
69
        def get_objects():
 
70
            pack = Pack(path[:-5])
 
71
            for obj in pack.iterobjects():
 
72
                yield obj
 
73
 
 
74
        target = Repository.open(self.directory)
 
75
 
 
76
        target.lock_write()
 
77
        try:
 
78
            target.start_write_group()
 
79
            try:
 
80
                import_git_objects(target, self.mapping, iter(get_objects()))
 
81
            finally:
 
82
                target.commit_write_group()
 
83
        finally:
 
84
            target.unlock()
 
85
 
 
86
        for oldsha, sha, ref in refs:
 
87
            if ref[:11] == 'refs/heads/':
 
88
                branch_nick = ref[11:]
 
89
 
 
90
                try:
 
91
                    target_dir = BzrDir.open(self.directory + "/" + branch_nick)
 
92
                except:
 
93
                    target_dir = BzrDir.create(self.directory + "/" + branch_nick)
 
94
 
 
95
                try:
 
96
                    target_branch = target_dir.open_branch()
 
97
                except:
 
98
                    target_branch = target_dir.create_branch()
 
99
 
 
100
                rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
101
                target_branch.generate_revision_history(rev_id)
 
102
 
 
103
    def fetch_objects(self, determine_wants, graph_walker, progress):
72
104
        """ yield git objects to send to client """
 
105
        repo = Repository.open(self.directory)
 
106
 
 
107
        # If this is a Git repository, just use the existing fetch_objects implementation.
 
108
        if getattr(repo, "fetch_objects", None) is None:
 
109
            return repo.fetch_objects(determine_wants, graph_walker, None, progress)
73
110
 
74
111
        wants = determine_wants(self.get_refs())
75
 
        self.repo.lock_read()
 
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
 
 
118
        repo.lock_read()
76
119
        try:
77
 
            have = self.object_store.find_common_revisions(graph_walker)
78
 
            return self.object_store.generate_pack_contents(have, wants, progress,
79
 
                get_tagged)
 
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
 
80
144
        finally:
81
 
            self.repo.unlock()
82
 
 
83
 
 
84
 
def serve_git(transport, host=None, port=None, inet=False):
85
 
    backend = BzrBackend(transport)
86
 
 
87
 
    if host is None:
88
 
        host = 'localhost'
89
 
    if port:
90
 
        server = TCPGitServer(backend, host, port)
91
 
    else:
92
 
        server = TCPGitServer(backend, host)
93
 
    server.serve_forever()
 
145
            repo.unlock()
 
146
 
 
147
        return (len(objects), iter(objects))
 
148