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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

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