/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 locking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
16
16
# along with this program; if not, write to the Free Software
17
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
18
 
 
19
import os
 
20
import tempfile
 
21
 
19
22
from dulwich.server import TCPGitServer
20
23
 
21
24
from bzrlib.bzrdir import (
22
25
    BzrDir,
23
26
    )
 
27
from bzrlib.errors import (
 
28
    NotBranchError,
 
29
    )
24
30
 
 
31
from bzrlib.plugins.git.branch import (
 
32
    branch_name_to_ref,
 
33
    ref_to_branch_name,
 
34
    )
 
35
from bzrlib.plugins.git.fetch import (
 
36
    import_git_objects,
 
37
    )
25
38
from bzrlib.plugins.git.mapping import (
26
39
    default_mapping,
27
40
    )
28
41
from bzrlib.plugins.git.object_store import (
29
42
    get_object_store
30
43
    )
31
 
from bzrlib.plugins.git.refs import (
32
 
    BazaarRefsContainer,
33
 
    )
34
44
 
35
45
from dulwich.server import (
36
46
    Backend,
37
47
    BackendRepo,
38
48
    )
 
49
from dulwich.pack import (
 
50
    PackData,
 
51
    Pack,
 
52
    )
39
53
 
40
54
class BzrBackend(Backend):
41
55
    """A git serve backend that can use a Bazaar repository."""
58
72
        self.repo_dir = BzrDir.open_from_transport(self.transport)
59
73
        self.repo = self.repo_dir.find_repository()
60
74
        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
 
    def get_refs(self):
65
 
        return self._refs
66
75
 
67
76
    def get_peeled(self, name):
68
77
        return self.get_refs()[name]
69
78
 
 
79
    def get_refs(self):
 
80
        """Return a dict of all tags and branches in repository (and shas) """
 
81
        ret = {}
 
82
        self.repo.lock_read()
 
83
        try:
 
84
            for branch in self.repo_dir.list_branches():
 
85
                ref = branch_name_to_ref(branch.name, "refs/heads/master")
 
86
                ret[ref] = self.object_store._lookup_revision_sha1(
 
87
                    branch.last_revision())
 
88
                assert type(ref) == str and type(ret[ref]) == str, \
 
89
                        "(%s) %r -> %r" % (branch.name, ref, ret[ref])
 
90
 
 
91
        finally:
 
92
            self.repo.unlock()
 
93
        return ret
 
94
 
 
95
    def apply_pack(self, refs, read):
 
96
        """Apply pack from client to current repository"""
 
97
 
 
98
        fd, path = tempfile.mkstemp(suffix=".pack")
 
99
        f = os.fdopen(fd, 'w')
 
100
        f.write(read())
 
101
        f.close()
 
102
 
 
103
        pd = PackData(path)
 
104
        pd.create_index_v2(path[:-5]+".idx", self.object_store.get_raw)
 
105
 
 
106
        p = Pack(path[:-5])
 
107
        heads = [k[1] for k in refs]
 
108
 
 
109
        self.repo.lock_write()
 
110
        try:
 
111
            self.repo.start_write_group()
 
112
            try:
 
113
                import_git_objects(self.repo, self.mapping, 
 
114
                    p.iterobjects(get_raw=self.object_store.get_raw),
 
115
                    self.object_store, heads)
 
116
            except:
 
117
                self.repo.abort_write_group()
 
118
                raise
 
119
            else:
 
120
                self.repo.commit_write_group()
 
121
        finally:
 
122
            self.repo.unlock()
 
123
 
 
124
        for oldsha, sha, ref in refs:
 
125
            try:
 
126
                branch_name = ref_to_branch_name(ref)
 
127
            except ValueError:
 
128
                # FIXME: Cope with tags!
 
129
                continue
 
130
            try:
 
131
                target_branch = self.repo_dir.open_branch(branch_name)
 
132
            except NotBranchError:
 
133
                target_branch = self.repo.create_branch(branch_name)
 
134
 
 
135
            rev_id = self.mapping.revision_id_foreign_to_bzr(sha)
 
136
            target_branch.lock_write()
 
137
            try:
 
138
                target_branch.generate_revision_history(rev_id)
 
139
            finally:
 
140
                target_branch.unlock()
 
141
 
70
142
    def fetch_objects(self, determine_wants, graph_walker, progress,
71
143
        get_tagged=None):
72
144
        """ yield git objects to send to client """
 
145
        # If this is a Git repository, just use the existing fetch_objects implementation.
 
146
        if getattr(self.repo, "fetch_objects", None) is not None:
 
147
            return self.repo.fetch_objects(determine_wants, graph_walker, None, progress)[0]
73
148
 
74
149
        wants = determine_wants(self.get_refs())
 
150
        graph_walker.reset()
 
151
 
75
152
        self.repo.lock_read()
76
153
        try:
77
154
            have = self.object_store.find_common_revisions(graph_walker)
78
 
            return self.object_store.generate_pack_contents(have, wants, progress,
79
 
                get_tagged)
 
155
            return self.object_store.generate_pack_contents(have, wants)
80
156
        finally:
81
157
            self.repo.unlock()
82
158