/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 remote.py

Fix branch cloning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
1
 
# Copyright (C) 2007-2009 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2007-2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import bzrlib
18
 
from bzrlib import branch, tag, urlutils
 
18
from bzrlib import urlutils
19
19
from bzrlib.bzrdir import BzrDir, BzrDirFormat
20
 
from bzrlib.errors import BzrError, NoSuchFile, NotLocalUrl
 
20
from bzrlib.errors import NoSuchFile, NotLocalUrl
21
21
from bzrlib.lockable_files import TransportLock
22
22
from bzrlib.repository import Repository
23
23
from bzrlib.trace import info
24
24
from bzrlib.transport import Transport
25
25
 
26
 
from bzrlib.plugins.git import lazy_check_versions
27
 
lazy_check_versions()
28
 
 
 
26
from bzrlib.plugins.git import git
29
27
from bzrlib.plugins.git.branch import GitBranch
30
28
from bzrlib.plugins.git.errors import NoSuchRef
31
29
from bzrlib.plugins.git.dir import GitDir
37
35
import urllib
38
36
import urlparse
39
37
 
40
 
import dulwich as git
41
 
from dulwich.errors import GitProtocolError
42
 
from dulwich.pack import PackData, Pack, PackIndex
43
 
 
44
 
# Don't run any tests on GitSmartTransport as it is not intended to be 
45
 
# a full implementation of Transport
46
 
def get_test_permutations():
47
 
    return []
 
38
from dulwich.pack import PackData, Pack
48
39
 
49
40
 
50
41
class GitSmartTransport(Transport):
57
48
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
58
49
        self._client = _client
59
50
 
60
 
    def has(self, relpath):
61
 
        return False
62
 
 
63
51
    def _get_client(self):
64
52
        if self._client is not None:
65
53
            ret = self._client
66
54
            self._client = None
67
55
            return ret
68
 
        return git.client.TCPGitClient(self._host, self._port, thin_packs=False)
 
56
        return git.client.TCPGitClient(self._host, self._port)
69
57
 
70
58
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
71
59
        if progress is None:
72
60
            def progress(text):
73
61
                info("git: %s" % text)
74
 
        client = self._get_client()
75
 
        try:
76
 
            client.fetch_pack(self._path, determine_wants, 
77
 
                graph_walker, pack_data, progress)
78
 
        except GitProtocolError, e:
79
 
            raise BzrError(e)
 
62
        self._get_client().fetch_pack(self._path, determine_wants, 
 
63
            graph_walker, pack_data, progress)
80
64
 
81
65
    def get(self, path):
82
66
        raise NoSuchFile(path)
105
89
    def open_repository(self):
106
90
        return RemoteGitRepository(self, self._lockfiles)
107
91
 
108
 
    def open_branch(self, _unsupported=False):
 
92
    def open_branch(self):
109
93
        repo = self.open_repository()
110
94
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
111
95
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
114
98
        raise NotLocalUrl(self.transport.base)
115
99
 
116
100
 
117
 
class EmptyObjectStoreIterator(dict):
118
 
 
119
 
    def iterobjects(self):
120
 
        return []
121
 
 
122
 
 
123
 
class TemporaryPackIterator(Pack):
124
 
 
125
 
    def __init__(self, path, resolve_ext_ref):
126
 
        self.resolve_ext_ref = resolve_ext_ref
127
 
        super(TemporaryPackIterator, self).__init__(path)
128
 
 
129
 
    @property
130
 
    def idx(self):
131
 
        if self._idx is None:
132
 
            self._data.create_index_v2(self._idx_path, self.resolve_ext_ref)
133
 
            self._idx = PackIndex(self._idx_path)
134
 
        return self._idx
135
 
 
136
 
    def __del__(self):
137
 
        os.remove(self._data_path)
138
 
        os.remove(self._idx_path)
139
 
 
140
 
 
141
101
class RemoteGitRepository(GitRepository):
142
102
 
143
103
    def __init__(self, gitdir, lockfiles):
144
104
        GitRepository.__init__(self, gitdir, lockfiles)
145
 
        self._refs = None
146
 
 
147
 
    def get_refs(self):
148
 
        if self._refs is not None:
149
 
            return self._refs
150
 
        def determine_wants(heads):
151
 
            self._refs = heads
152
 
            return []
153
 
        self.bzrdir.root_transport.fetch_pack(determine_wants, None, 
154
 
            lambda x: None, lambda x: mutter("git: %s" % x))
155
 
        return self._refs
156
105
 
157
106
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
158
107
                   progress=None):
159
108
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
160
109
            progress)
161
110
 
162
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
111
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
163
112
        fd, path = tempfile.mkstemp(suffix=".pack")
164
113
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
165
114
        os.close(fd)
166
 
        if os.path.getsize(path) == 0:
167
 
            return EmptyObjectStoreIterator()
168
 
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
169
 
 
170
 
 
171
 
class RemoteGitTagDict(tag.BasicTags):
172
 
 
173
 
    def __init__(self, branch):
174
 
        self.branch = branch
175
 
        self.repository = branch.repository
176
 
 
177
 
    def get_tag_dict(self):
178
 
        ret = {}
179
 
        refs = self.repository.get_refs()
180
 
        for k,v in refs.iteritems():
181
 
            if k.startswith("refs/tags/") and not k.endswith("^{}"):
182
 
                v = refs.get(k+"^{}", v)
183
 
                ret[k[len("refs/tags/"):]] = self.branch.mapping.revision_id_foreign_to_bzr(v)
184
 
        return ret
185
 
 
186
 
    def set_tag(self, name, revid):
187
 
        # FIXME: Not supported yet, should do a push of a new ref
188
 
        raise NotImplementedError(self.set_tag)
 
115
        try:
 
116
            basename = path[:-len(".pack")]
 
117
            p = PackData(path)
 
118
            p.create_index_v2(basename+".idx")
 
119
            for o in Pack(basename).iterobjects():
 
120
                yield o
 
121
        finally:
 
122
            os.remove(path)
189
123
 
190
124
 
191
125
class RemoteGitBranch(GitBranch):
192
126
 
193
127
    def __init__(self, bzrdir, repository, name, lockfiles):
194
 
        heads = repository.get_refs()
195
 
        if not name in heads:
196
 
            raise NoSuchRef(name)
197
 
        self._ref = heads[name]
 
128
        def determine_wants(heads):
 
129
            if not name in heads:
 
130
                raise NoSuchRef(name)
 
131
            self._ref = heads[name]
 
132
        bzrdir.root_transport.fetch_pack(determine_wants, None, lambda x: None, 
 
133
                             lambda x: mutter("git: %s" % x))
198
134
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, self._ref, lockfiles)
199
135
 
200
136
    def last_revision(self):