76
from dulwich.pack import load_pack_index
78
from dulwich.pack import PackIndex as load_pack_index
81
# Don't run any tests on GitSmartTransport as it is not intended to be
72
from dulwich.pack import load_pack_index
75
# Don't run any tests on GitSmartTransport as it is not intended to be
82
76
# a full implementation of Transport
83
77
def get_test_permutations():
81
def split_git_url(url):
85
:return: Tuple with host, port, username, path.
87
(scheme, _, loc, _, _) = urlparse.urlsplit(url)
88
hostport, escaped_path = urllib.splithost(loc)
89
path = urllib.unquote(escaped_path)
90
if path.startswith("/~"):
92
(username, hostport) = urllib.splituser(hostport)
93
(host, port) = urllib.splitnport(hostport, None)
94
return (host, port, username, path)
87
97
class GitSmartTransport(Transport):
89
99
def __init__(self, url, _client=None):
90
100
Transport.__init__(self, url)
91
(scheme, _, loc, _, _) = urlparse.urlsplit(url)
92
hostport, self._path = urllib.splithost(loc)
93
(self._username, hostport) = urllib.splituser(hostport)
94
(self._host, self._port) = urllib.splitnport(hostport, None)
101
(self._host, self._port, self._username, self._path) = \
103
if 'transport' in debug.debug_flags:
104
trace.mutter('host: %r, user: %r, port: %r, path: %r',
105
self._host, self._username, self._port, self._path)
95
106
self._client = _client
97
108
def external_url(self):
109
120
def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
110
121
if progress is None:
111
122
def progress(text):
112
info("git: %s" % text)
113
client = self._get_client()
123
trace.info("git: %s" % text)
124
client = self._get_client(thin_packs=False)
115
return client.fetch_pack(self._get_path(), determine_wants,
126
return client.fetch_pack(self._get_path(), determine_wants,
116
127
graph_walker, pack_data, progress)
117
128
except GitProtocolError, e:
118
129
raise BzrError(e)
120
131
def send_pack(self, get_changed_refs, generate_pack_contents):
121
client = self._get_client()
132
client = self._get_client(thin_packs=False)
123
return client.send_pack(self._get_path(), get_changed_refs,
134
return client.send_pack(self._get_path(), get_changed_refs,
124
135
generate_pack_contents)
125
136
except GitProtocolError, e:
126
137
raise BzrError(e)
148
def _get_client(self):
159
def _get_client(self, thin_packs):
149
160
if self._client is not None:
150
161
ret = self._client
151
162
self._client = None
153
return git.client.TCPGitClient(self._host, self._port, thin_packs=False,
164
return git.client.TCPGitClient(self._host, self._port, thin_packs=thin_packs,
154
165
report_activity=self._report_activity)
163
174
return self._path[3:]
164
175
return self._path
166
def _get_client(self):
177
def _get_client(self, thin_packs):
167
178
if self._client is not None:
168
179
ret = self._client
169
180
self._client = None
171
182
return git.client.SSHGitClient(self._host, self._port, self._username,
172
thin_packs=False, report_activity=self._report_activity)
183
thin_packs=thin_packs, report_activity=self._report_activity)
175
186
class RemoteGitDir(GitDir):
189
200
# TODO: Support for multiple branches in one bzrdir in bzrlib!
190
201
return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
192
def open_workingtree(self):
203
def open_workingtree(self, recommend_upgrade=False):
193
204
raise NotLocalUrl(self.transport.base)
206
217
self.resolve_ext_ref = resolve_ext_ref
221
if self._data is None:
222
self._data = PackData(self._data_path)
210
227
if self._idx is None:
211
pb = ui.ui_factory.nested_progress_bar()
213
def report_progress(cur, total):
214
pb.update("generating index", cur, total)
215
self.data.create_index(self._idx_path, self.resolve_ext_ref,
216
progress=report_progress)
228
if not os.path.exists(self._idx_path):
229
pb = ui.ui_factory.nested_progress_bar()
231
def report_progress(cur, total):
232
pb.update("generating index", cur, total)
233
self.data.create_index(self._idx_path, self.resolve_ext_ref,
234
progress=report_progress)
219
237
self._idx = load_pack_index(self._idx_path)
222
240
def __del__(self):
223
os.remove(self._data_path)
224
os.remove(self._idx_path)
241
if self._idx is not None:
243
os.remove(self._idx_path)
244
if self._data is not None:
246
os.remove(self._data_path)
227
249
class RemoteGitRepository(GitRepository):
245
267
def get_refs(self):
246
268
if self._refs is not None:
247
269
return self._refs
248
self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None,
249
lambda x: None, lambda x: mutter("git: %s" % x))
270
self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None,
271
lambda x: None, lambda x: trace.mutter("git: %s" % x))
250
272
return self._refs
252
def fetch_pack(self, determine_wants, graph_walker, pack_data,
274
def fetch_pack(self, determine_wants, graph_walker, pack_data,
254
276
return self._transport.fetch_pack(determine_wants, graph_walker,
255
277
pack_data, progress)
257
279
def send_pack(self, get_changed_refs, generate_pack_contents):
258
280
return self._transport.send_pack(get_changed_refs, generate_pack_contents)
260
def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
282
def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
261
284
fd, path = tempfile.mkstemp(suffix=".pack")
262
self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
285
self.fetch_pack(determine_wants, graph_walker,
286
lambda x: os.write(fd, x), progress)
264
288
if os.path.getsize(path) == 0:
265
289
return EmptyObjectStoreIterator()
266
290
return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
268
def lookup_git_revid(self, bzr_revid):
292
def lookup_bzr_revision_id(self, bzr_revid):
269
293
# This won't work for any round-tripped bzr revisions, but it's a start..
271
295
return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
280
304
self.repository = branch.repository
282
306
def get_tag_dict(self):
283
return extract_tags(self.repository.get_refs(), self.branch.mapping)
308
for k, v in extract_tags(self.repository.get_refs()).iteritems():
309
tags[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
285
312
def set_tag(self, name, revid):
286
313
# FIXME: Not supported yet, should do a push of a new ref
292
319
def __init__(self, bzrdir, repository, name, lockfiles):
294
super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
321
super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
297
324
def revision_history(self):
300
327
def last_revision(self):
301
328
return self.mapping.revision_id_foreign_to_bzr(self.head)
330
def _get_config(self):
331
class EmptyConfig(object):
333
def _get_configobj(self):
334
return config.ConfigObj()
305
340
if self._ref is not None:
307
342
heads = self.repository.get_refs()
308
343
if not self.name in heads:
309
raise NoSuchRef(name)
344
raise NoSuchRef(self.name)
310
345
self._ref = heads[self.name]
313
348
def _synchronize_history(self, destination, revision_id):
314
349
"""See Branch._synchronize_history()."""
315
350
destination.generate_revision_history(self.last_revision())
317
352
def get_push_location(self):