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 branch.py
- browse files at revision 0.200.972
- compare with another revision
- download diff
- download tarball
- view history from revision 0.200.972
- Committer: Jelmer Vernooij
- Date: 2010-07-28 15:09:04 UTC
- mto: (0.312.1 master) (6883.23.1 bundle-git)
- mto: This revision was merged to the branch mainline in revision 6960.
- Revision ID: jelmer@samba.org-20100728150904-2ghxu1nmd57t7ii0
Use BZR_PLUGINS_AT.
- files added:
- HACKING
- files removed:
- foreign
- files renamed:
- shamap.py => cache.py
- converter.py => object_store.py
- tests/test_ids.py => tests/test_mapping.py
- files modified:
- Makefile
added
removed
branch.py
1
1
# Copyright (C) 2007 Canonical Ltd
2
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
16
17
17
18
"""An adapter between a Git Branch and a Bazaar Branch"""
18
19
20
from dulwich.objects import (
21
Commit,
22
Tag,
23
)
24
19
25
from bzrlib import (
20
26
branch,
27
bzrdir,
21
28
config,
29
errors,
22
30
repository,
23
31
revision,
24
32
tag,
25
)
26
from bzrlib.decorators import needs_read_lock
27
from bzrlib.trace import mutter
28
29
from bzrlib.plugins.git.foreign import ForeignBranch
30
from bzrlib.plugins.git.errors import LightWeightCheckoutsNotSupported
31
32
from dulwich.objects import (
33
Commit,
34
Tag,
35
)
36
37
class GitTagDict(tag.BasicTags):
33
transport,
34
)
35
from bzrlib.decorators import (
36
needs_read_lock,
37
)
38
from bzrlib.revision import (
39
NULL_REVISION,
40
)
41
from bzrlib.trace import (
42
is_quiet,
43
mutter,
44
)
45
46
from bzrlib.plugins.git.config import (
47
GitBranchConfig,
48
)
49
from bzrlib.plugins.git.errors import (
50
NoPushSupport,
51
NoSuchRef,
52
)
53
from bzrlib.plugins.git.refs import (
54
ref_to_branch_name,
55
extract_tags,
56
tag_name_to_ref,
57
)
58
59
from bzrlib.foreign import ForeignBranch
60
61
62
class GitPullResult(branch.PullResult):
63
"""Result of a pull from a Git branch."""
64
65
def _lookup_revno(self, revid):
66
assert isinstance(revid, str), "was %r" % revid
67
# Try in source branch first, it'll be faster
68
return self.target_branch.revision_id_to_revno(revid)
69
70
@property
71
def old_revno(self):
72
return self._lookup_revno(self.old_revid)
73
74
@property
75
def new_revno(self):
76
return self._lookup_revno(self.new_revid)
77
78
79
class LocalGitTagDict(tag.BasicTags):
80
"""Dictionary with tags in a local repository."""
38
81
39
82
def __init__(self, branch):
40
83
self.branch = branch
42
85
43
86
def get_tag_dict(self):
44
87
ret = {}
45
for k,v in self.repository._git.tags.iteritems():
46
obj = self.repository._git.get_object(v)
88
for k,v in extract_tags(self.repository._git.get_refs()).iteritems():
89
try:
90
obj = self.repository._git[v]
91
except KeyError:
92
mutter("Tag %s points at unknown object %s, ignoring", v, obj)
93
continue
47
94
while isinstance(obj, Tag):
48
95
v = obj.object[1]
49
obj = self.repository._git.get_object(v)
96
obj = self.repository._git[v]
50
97
if not isinstance(obj, Commit):
51
mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
98
mutter("Tag %s points at object %r that is not a commit, "
99
"ignoring", k, obj)
52
100
continue
53
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
101
ret[k] = self.branch.lookup_foreign_revision_id(v)
54
102
return ret
55
103
104
def _set_tag_dict(self, to_dict):
105
extra = set(self.repository._git.get_refs().keys())
106
for k, revid in to_dict.iteritems():
107
name = tag_name_to_ref(k)
108
if name in extra:
109
extra.remove(name)
110
self.set_tag(k, revid)
111
for name in extra:
112
if name.startswith("refs/tags/"):
113
del self.repository._git[name]
114
56
115
def set_tag(self, name, revid):
57
self.repository._git.tags[name] = revid
58
59
60
class GitBranchConfig(config.BranchConfig):
61
"""BranchConfig that uses locations.conf in place of branch.conf"""
62
63
def __init__(self, branch):
64
config.BranchConfig.__init__(self, branch)
65
# do not provide a BranchDataConfig
66
self.option_sources = self.option_sources[0], self.option_sources[2]
67
68
def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
69
"""Force local to True"""
70
config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
116
self.repository._git.refs[tag_name_to_ref(name)], _ = \
117
self.branch.mapping.revision_id_bzr_to_foreign(revid)
118
119
120
class DictTagDict(LocalGitTagDict):
121
122
def __init__(self, branch, tags):
123
super(DictTagDict, self).__init__(branch)
124
self._tags = tags
125
126
def get_tag_dict(self):
127
return self._tags
71
128
72
129
73
130
class GitBranchFormat(branch.BranchFormat):
75
132
def get_format_description(self):
76
133
return 'Git Branch'
77
134
135
def network_name(self):
136
return "git"
137
78
138
def supports_tags(self):
79
139
return True
80
140
141
def get_foreign_tests_branch_factory(self):
142
from bzrlib.plugins.git.tests.test_branch import ForeignTestsBranchFactory
143
return ForeignTestsBranchFactory()
144
145
def make_tags(self, branch):
146
if getattr(branch.repository, "get_refs", None) is not None:
147
from bzrlib.plugins.git.remote import RemoteGitTagDict
148
return RemoteGitTagDict(branch)
149
else:
150
return LocalGitTagDict(branch)
151
152
153
class GitReadLock(object):
154
155
def __init__(self, unlock):
156
self.unlock = unlock
157
158
159
class GitWriteLock(object):
160
161
def __init__(self, unlock):
162
self.unlock = unlock
163
81
164
82
165
class GitBranch(ForeignBranch):
83
166
"""An adapter to git repositories for bzr Branch objects."""
84
167
85
def __init__(self, bzrdir, repository, name, head, lockfiles):
168
def __init__(self, bzrdir, repository, ref, lockfiles, tagsdict=None):
86
169
self.repository = repository
87
super(GitBranch, self).__init__(repository.get_mapping())
170
self._format = GitBranchFormat()
88
171
self.control_files = lockfiles
89
172
self.bzrdir = bzrdir
90
self.name = name
91
self.head = head
92
self.base = bzrdir.transport.base
93
self._format = GitBranchFormat()
94
95
def dpull(self, source, stop_revision=None):
96
if stop_revision is None:
97
stop_revision = source.last_revision()
98
# FIXME: Check for diverged branches
99
revidmap = self.repository.dfetch(source.repository, stop_revision)
100
self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(revidmap[stop_revision])
101
return revidmap
173
super(GitBranch, self).__init__(repository.get_mapping())
174
if tagsdict is not None:
175
self.tags = DictTagDict(self, tagsdict)
176
self.ref = ref
177
self.name = ref_to_branch_name(ref)
178
self._head = None
179
self.base = bzrdir.root_transport.base
180
181
def _get_checkout_format(self):
182
"""Return the most suitable metadir for a checkout of this branch.
183
Weaves are used if this branch's repository uses weaves.
184
"""
185
return bzrdir.format_registry.make_bzrdir("default")
186
187
def get_child_submit_format(self):
188
"""Return the preferred format of submissions to this branch."""
189
ret = self.get_config().get_user_option("child_submit_format")
190
if ret is not None:
191
return ret
192
return "git"
193
194
def _get_nick(self, local=False, possible_master_transports=None):
195
"""Find the nick name for this branch.
196
197
:return: Branch nick
198
"""
199
return self.name or "HEAD"
200
201
def _set_nick(self, nick):
202
raise NotImplementedError
203
204
nick = property(_get_nick, _set_nick)
205
206
def __repr__(self):
207
return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
208
self.ref or "HEAD")
209
210
def generate_revision_history(self, revid, old_revid=None):
211
# FIXME: Check that old_revid is in the ancestry of revid
212
newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
213
self._set_head(newhead)
102
214
103
215
def lock_write(self):
104
216
self.control_files.lock_write()
217
return GitWriteLock(self.unlock)
105
218
106
219
def get_stacked_on_url(self):
107
220
# Git doesn't do stacking (yet...)
108
return None
221
raise errors.UnstackableBranchFormat(self._format, self.base)
109
222
110
223
def get_parent(self):
111
224
"""See Branch.get_parent()."""
225
# FIXME: Set "origin" url from .git/config ?
112
226
return None
113
227
114
228
def set_parent(self, url):
229
# FIXME: Set "origin" url in .git/config ?
115
230
pass
116
231
117
232
def lock_read(self):
118
233
self.control_files.lock_read()
234
return GitReadLock(self.unlock)
235
236
def is_locked(self):
237
return self.control_files.is_locked()
119
238
120
239
def unlock(self):
121
240
self.control_files.unlock()
123
242
def get_physical_lock_status(self):
124
243
return False
125
244
126
127
class LocalGitBranch(GitBranch):
128
129
245
@needs_read_lock
130
246
def last_revision(self):
131
247
# perhaps should escape this ?
132
248
if self.head is None:
133
249
return revision.NULL_REVISION
134
return self.mapping.revision_id_foreign_to_bzr(self.head)
135
136
def create_checkout(self, to_location, revision_id=None,
137
lightweight=False, accelerator_tree=None, hardlink=False):
250
return self.lookup_foreign_revision_id(self.head)
251
252
def _basic_push(self, target, overwrite=False, stop_revision=None):
253
return branch.InterBranch.get(self, target)._basic_push(
254
overwrite, stop_revision)
255
256
def lookup_foreign_revision_id(self, foreign_revid):
257
return self.repository.lookup_foreign_revision_id(foreign_revid,
258
self.mapping)
259
260
261
class LocalGitBranch(GitBranch):
262
"""A local Git branch."""
263
264
def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
265
super(LocalGitBranch, self).__init__(bzrdir, repository, name,
266
lockfiles, tagsdict)
267
refs = repository._git.get_refs()
268
if not (name in refs.keys() or "HEAD" in refs.keys()):
269
raise errors.NotBranchError(self.base)
270
271
def create_checkout(self, to_location, revision_id=None, lightweight=False,
272
accelerator_tree=None, hardlink=False):
138
273
if lightweight:
139
raise LightWeightCheckoutsNotSupported()
140
return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
274
t = transport.get_transport(to_location)
275
t.ensure_base()
276
format = self._get_checkout_format()
277
checkout = format.initialize_on_transport(t)
278
from_branch = branch.BranchReferenceFormat().initialize(checkout,
279
self)
280
tree = checkout.create_workingtree(revision_id,
281
from_branch=from_branch, hardlink=hardlink)
282
return tree
283
else:
284
return self._create_heavyweight_checkout(to_location, revision_id,
285
hardlink)
141
286
142
def _create_heavyweight_checkout(self, to_location, revision_id=None,
287
def _create_heavyweight_checkout(self, to_location, revision_id=None,
143
288
hardlink=False):
144
289
"""Create a new heavyweight checkout of this branch.
145
290
148
293
:param hardlink: Whether to hardlink
149
294
:return: WorkingTree object of checkout.
150
295
"""
151
checkout_branch = BzrDir.create_branch_convenience(
152
to_location, force_new_tree=False, format=get_rich_root_format())
296
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
297
to_location, force_new_tree=False)
153
298
checkout = checkout_branch.bzrdir
154
299
checkout_branch.bind(self)
155
# pull up to the specified revision_id to set the initial
300
# pull up to the specified revision_id to set the initial
156
301
# branch tip correctly, and seed it with history.
157
302
checkout_branch.pull(self, stop_revision=revision_id)
158
303
return checkout.create_workingtree(revision_id, hardlink=hardlink)
159
304
160
def _make_tags(self):
161
return GitTagDict(self)
162
163
305
def _gen_revision_history(self):
164
306
if self.head is None:
165
307
return []
166
ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
308
ret = list(self.repository.iter_reverse_revision_history(
309
self.last_revision()))
167
310
ret.reverse()
168
311
return ret
169
312
313
def _get_head(self):
314
try:
315
return self.repository._git.ref(self.ref or "HEAD")
316
except KeyError:
317
return None
318
319
def set_last_revision_info(self, revno, revid):
320
self.set_last_revision(revid)
321
322
def set_last_revision(self, revid):
323
(newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
324
self.head = newhead
325
326
def _set_head(self, value):
327
self._head = value
328
self.repository._git.refs[self.ref or "HEAD"] = self._head
329
self._clear_cached_state()
330
331
head = property(_get_head, _set_head)
332
170
333
def get_config(self):
171
334
return GitBranchConfig(self)
172
335
183
346
def supports_tags(self):
184
347
return True
185
348
186
def sprout(self, to_bzrdir, revision_id=None):
187
"""See Branch.sprout()."""
188
result = to_bzrdir.create_branch()
189
self.copy_content_into(result, revision_id=revision_id)
190
result.set_parent(self.bzrdir.root_transport.base)
191
return result
192
193
194
class InterGitGenericBranch(branch.InterBranch):
195
196
@classmethod
197
def is_compatible(self, source, target):
198
return isinstance(source, GitBranch)
199
200
def update_revisions(self, stop_revision=None, overwrite=False,
201
graph=None):
202
"""See InterBranch.update_revisions()."""
203
# TODO: stop_revision, overwrite
204
interrepo = repository.InterRepository.get(self.source.repository, self.target.repository)
205
self._last_revid = None
349
350
class GitBranchPullResult(branch.PullResult):
351
352
def __init__(self):
353
super(GitBranchPullResult, self).__init__()
354
self.new_git_head = None
355
self._old_revno = None
356
self._new_revno = None
357
358
def report(self, to_file):
359
if not is_quiet():
360
if self.old_revid == self.new_revid:
361
to_file.write('No revisions to pull.\n')
362
elif self.new_git_head is not None:
363
to_file.write('Now on revision %d (git sha: %s).\n' %
364
(self.new_revno, self.new_git_head))
365
else:
366
to_file.write('Now on revision %d.\n' % (self.new_revno,))
367
self._show_tag_conficts(to_file)
368
369
def _lookup_revno(self, revid):
370
assert isinstance(revid, str), "was %r" % revid
371
# Try in source branch first, it'll be faster
372
try:
373
return self.source_branch.revision_id_to_revno(revid)
374
except errors.NoSuchRevision:
375
# FIXME: Check using graph.find_distance_to_null() ?
376
return self.target_branch.revision_id_to_revno(revid)
377
378
def _get_old_revno(self):
379
if self._old_revno is not None:
380
return self._old_revno
381
return self._lookup_revno(self.old_revid)
382
383
def _set_old_revno(self, revno):
384
self._old_revno = revno
385
386
old_revno = property(_get_old_revno, _set_old_revno)
387
388
def _get_new_revno(self):
389
if self._new_revno is not None:
390
return self._new_revno
391
return self._lookup_revno(self.new_revid)
392
393
def _set_new_revno(self, revno):
394
self._new_revno = revno
395
396
new_revno = property(_get_new_revno, _set_new_revno)
397
398
399
class GitBranchPushResult(branch.BranchPushResult):
400
401
def _lookup_revno(self, revid):
402
assert isinstance(revid, str), "was %r" % revid
403
# Try in source branch first, it'll be faster
404
try:
405
return self.source_branch.revision_id_to_revno(revid)
406
except errors.NoSuchRevision:
407
# FIXME: Check using graph.find_distance_to_null() ?
408
return self.target_branch.revision_id_to_revno(revid)
409
410
@property
411
def old_revno(self):
412
return self._lookup_revno(self.old_revid)
413
414
@property
415
def new_revno(self):
416
return self._lookup_revno(self.new_revid)
417
418
419
class InterFromGitBranch(branch.GenericInterBranch):
420
"""InterBranch implementation that pulls from Git into bzr."""
421
422
@classmethod
423
def _get_interrepo(self, source, target):
424
return repository.InterRepository.get(source.repository,
425
target.repository)
426
427
@classmethod
428
def is_compatible(cls, source, target):
429
return (isinstance(source, GitBranch) and
430
not isinstance(target, GitBranch) and
431
(getattr(cls._get_interrepo(source, target), "fetch_objects", None) is not None))
432
433
def _update_revisions(self, stop_revision=None, overwrite=False,
434
graph=None, limit=None):
435
"""Like InterBranch.update_revisions(), but with additions.
436
437
Compared to the `update_revisions()` below, this function takes a
438
`limit` argument that limits how many git commits will be converted
439
and returns the new git head.
440
"""
441
interrepo = self._get_interrepo(self.source, self.target)
206
442
def determine_wants(heads):
207
if not self.source.name in heads:
208
raise BzrError("No such remote branch '%s', found: %r" % (
209
self.source.name, heads.keys()))
210
head = heads[self.source.name]
211
self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
443
if self.source.ref is not None and not self.source.ref in heads:
444
raise NoSuchRef(self.source.ref, heads.keys())
445
if stop_revision is not None:
446
self._last_revid = stop_revision
447
head, mapping = self.source.repository.lookup_bzr_revision_id(
448
stop_revision)
449
else:
450
if self.source.ref is not None:
451
head = heads[self.source.ref]
452
else:
453
head = heads["HEAD"]
454
self._last_revid = self.source.lookup_foreign_revision_id(head)
212
455
if self.target.repository.has_revision(self._last_revid):
213
456
return []
214
457
return [head]
215
interrepo.fetch_objects(determine_wants, self.source.mapping)
216
self.target.generate_revision_history(self._last_revid)
217
218
219
branch.InterBranch.register_optimiser(InterGitGenericBranch)
458
pack_hint, head = interrepo.fetch_objects(
459
determine_wants, self.source.mapping, limit=limit)
460
if (pack_hint is not None and
461
self.target.repository._format.pack_compresses):
462
self.target.repository.pack(hint=pack_hint)
463
if head is not None:
464
self._last_revid = self.source.lookup_foreign_revision_id(head)
465
if overwrite:
466
prev_last_revid = None
467
else:
468
prev_last_revid = self.target.last_revision()
469
self.target.generate_revision_history(self._last_revid,
470
prev_last_revid)
471
return head
472
473
def update_revisions(self, stop_revision=None, overwrite=False,
474
graph=None):
475
"""See InterBranch.update_revisions()."""
476
self._update_revisions(stop_revision, overwrite, graph)
477
478
def pull(self, overwrite=False, stop_revision=None,
479
possible_transports=None, _hook_master=None, run_hooks=True,
480
_override_hook_target=None, local=False, limit=None):
481
"""See Branch.pull.
482
483
:param _hook_master: Private parameter - set the branch to
484
be supplied as the master to pull hooks.
485
:param run_hooks: Private parameter - if false, this branch
486
is being called because it's the master of the primary branch,
487
so it should not run its hooks.
488
:param _override_hook_target: Private parameter - set the branch to be
489
supplied as the target_branch to pull hooks.
490
:param limit: Only import this many revisons. `None`, the default,
491
means import all revisions.
492
"""
493
# This type of branch can't be bound.
494
if local:
495
raise errors.LocalRequiresBoundBranch()
496
result = GitBranchPullResult()
497
result.source_branch = self.source
498
if _override_hook_target is None:
499
result.target_branch = self.target
500
else:
501
result.target_branch = _override_hook_target
502
self.source.lock_read()
503
try:
504
# We assume that during 'pull' the target repository is closer than
505
# the source one.
506
graph = self.target.repository.get_graph(self.source.repository)
507
(result.old_revno, result.old_revid) = \
508
self.target.last_revision_info()
509
result.new_git_head = self._update_revisions(
510
stop_revision, overwrite=overwrite, graph=graph, limit=limit)
511
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
512
overwrite)
513
(result.new_revno, result.new_revid) = \
514
self.target.last_revision_info()
515
if _hook_master:
516
result.master_branch = _hook_master
517
result.local_branch = result.target_branch
518
else:
519
result.master_branch = result.target_branch
520
result.local_branch = None
521
if run_hooks:
522
for hook in branch.Branch.hooks['post_pull']:
523
hook(result)
524
finally:
525
self.source.unlock()
526
return result
527
528
def _basic_push(self, overwrite=False, stop_revision=None):
529
result = branch.BranchPushResult()
530
result.source_branch = self.source
531
result.target_branch = self.target
532
graph = self.target.repository.get_graph(self.source.repository)
533
result.old_revno, result.old_revid = self.target.last_revision_info()
534
result.new_git_head = self._update_revisions(
535
stop_revision, overwrite=overwrite, graph=graph)
536
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
537
overwrite)
538
result.new_revno, result.new_revid = self.target.last_revision_info()
539
return result
540
541
542
class InterGitBranch(branch.GenericInterBranch):
543
"""InterBranch implementation that pulls between Git branches."""
544
545
546
class InterGitLocalRemoteBranch(InterGitBranch):
547
"""InterBranch that copies from a local to a remote git branch."""
548
549
@classmethod
550
def is_compatible(self, source, target):
551
from bzrlib.plugins.git.remote import RemoteGitBranch
552
return (isinstance(source, LocalGitBranch) and
553
isinstance(target, RemoteGitBranch))
554
555
def _basic_push(self, overwrite=False, stop_revision=None):
556
from dulwich.protocol import ZERO_SHA
557
result = GitBranchPushResult()
558
result.source_branch = self.source
559
result.target_branch = self.target
560
if stop_revision is None:
561
stop_revision = self.source.last_revision()
562
# FIXME: Check for diverged branches
563
def get_changed_refs(old_refs):
564
result.old_revid = self.target.lookup_foreign_revision_id(old_refs.get(self.target.ref, ZERO_SHA))
565
refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
566
result.new_revid = stop_revision
567
for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
568
refs[tag_name_to_ref(name)] = sha
569
return refs
570
self.target.repository.send_pack(get_changed_refs,
571
self.source.repository._git.object_store.generate_pack_contents)
572
return result
573
574
575
class InterGitRemoteLocalBranch(InterGitBranch):
576
"""InterBranch that copies from a remote to a local git branch."""
577
578
@classmethod
579
def is_compatible(self, source, target):
580
from bzrlib.plugins.git.remote import RemoteGitBranch
581
return (isinstance(source, RemoteGitBranch) and
582
isinstance(target, LocalGitBranch))
583
584
def _basic_push(self, overwrite=False, stop_revision=None):
585
result = branch.BranchPushResult()
586
result.source_branch = self.source
587
result.target_branch = self.target
588
result.old_revid = self.target.last_revision()
589
refs, stop_revision = self.update_refs(stop_revision)
590
self.target.generate_revision_history(stop_revision, result.old_revid)
591
self.update_tags(refs)
592
result.new_revid = self.target.last_revision()
593
return result
594
595
def update_tags(self, refs):
596
for name, v in extract_tags(refs).iteritems():
597
revid = self.target.lookup_foreign_revision_id(v)
598
self.target.tags.set_tag(name, revid)
599
600
def update_refs(self, stop_revision=None):
601
interrepo = repository.InterRepository.get(self.source.repository,
602
self.target.repository)
603
if stop_revision is None:
604
refs = interrepo.fetch(branches=["HEAD"])
605
stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
606
else:
607
refs = interrepo.fetch(revision_id=stop_revision)
608
return refs, stop_revision
609
610
def pull(self, stop_revision=None, overwrite=False,
611
possible_transports=None, run_hooks=True,local=False):
612
# This type of branch can't be bound.
613
if local:
614
raise errors.LocalRequiresBoundBranch()
615
result = GitPullResult()
616
result.source_branch = self.source
617
result.target_branch = self.target
618
result.old_revid = self.target.last_revision()
619
refs, stop_revision = self.update_refs(stop_revision)
620
self.target.generate_revision_history(stop_revision, result.old_revid)
621
self.update_tags(refs)
622
result.new_revid = self.target.last_revision()
623
return result
624
625
626
class InterToGitBranch(branch.GenericInterBranch):
627
"""InterBranch implementation that pulls from Git into bzr."""
628
629
def __init__(self, source, target):
630
super(InterToGitBranch, self).__init__(source, target)
631
self.interrepo = repository.InterRepository.get(source.repository,
632
target.repository)
633
634
@staticmethod
635
def _get_branch_formats_to_test():
636
return []
637
638
@classmethod
639
def is_compatible(self, source, target):
640
return (not isinstance(source, GitBranch) and
641
isinstance(target, GitBranch))
642
643
def update_revisions(self, *args, **kwargs):
644
raise NoPushSupport()
645
646
def _get_new_refs(self, stop_revision=None):
647
if stop_revision is None:
648
stop_revision = self.source.last_revision()
649
assert type(stop_revision) is str
650
main_ref = self.target.ref or "refs/heads/master"
651
refs = { main_ref: (None, stop_revision) }
652
for name, revid in self.source.tags.get_tag_dict().iteritems():
653
if self.source.repository.has_revision(revid):
654
refs[tag_name_to_ref(name)] = (None, revid)
655
return refs, main_ref
656
657
def pull(self, overwrite=False, stop_revision=None, local=False,
658
possible_transports=None):
659
from dulwich.protocol import ZERO_SHA
660
result = GitBranchPullResult()
661
result.source_branch = self.source
662
result.target_branch = self.target
663
new_refs, main_ref = self._get_new_refs(stop_revision)
664
def update_refs(old_refs):
665
refs = dict(old_refs)
666
# FIXME: Check for diverged branches
667
refs.update(new_refs)
668
return refs
669
old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
670
result.old_revid = self.target.lookup_foreign_revision_id(
671
old_refs.get(main_ref, ZERO_SHA))
672
result.new_revid = new_refs[main_ref]
673
return result
674
675
def push(self, overwrite=False, stop_revision=None,
676
_override_hook_source_branch=None):
677
from dulwich.protocol import ZERO_SHA
678
result = GitBranchPushResult()
679
result.source_branch = self.source
680
result.target_branch = self.target
681
new_refs, main_ref = self._get_new_refs(stop_revision)
682
def update_refs(old_refs):
683
refs = dict(old_refs)
684
# FIXME: Check for diverged branches
685
refs.update(new_refs)
686
return refs
687
old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
688
result.old_revid = self.target.lookup_foreign_revision_id(
689
old_refs.get(main_ref, ZERO_SHA))
690
result.new_revid = new_refs[main_ref]
691
return result
692
693
def lossy_push(self, stop_revision=None):
694
result = GitBranchPushResult()
695
result.source_branch = self.source
696
result.target_branch = self.target
697
new_refs, main_ref = self._get_new_refs(stop_revision)
698
def update_refs(old_refs):
699
refs = dict(old_refs)
700
# FIXME: Check for diverged branches
701
refs.update(new_refs)
702
return refs
703
result.revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(
704
update_refs)
705
result.old_revid = old_refs.get(self.target.ref, (None, NULL_REVISION))[1]
706
result.new_revid = new_refs[main_ref][1]
707
return result
708
709
710
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
711
branch.InterBranch.register_optimiser(InterFromGitBranch)
712
branch.InterBranch.register_optimiser(InterToGitBranch)
713
branch.InterBranch.register_optimiser(InterGitLocalRemoteBranch)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0