/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

https://launchpad.net/bugs/613502
Fix regression in git-import.

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], _ = \
 
116
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
109
117
            self.branch.mapping.revision_id_bzr_to_foreign(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
 
228
261
class LocalGitBranch(GitBranch):
229
262
    """A local Git branch."""
230
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
 
231
271
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
232
272
        accelerator_tree=None, hardlink=False):
233
273
        if lightweight:
235
275
            t.ensure_base()
236
276
            format = self._get_checkout_format()
237
277
            checkout = format.initialize_on_transport(t)
238
 
            from_branch = branch.BranchReferenceFormat().initialize(checkout, 
 
278
            from_branch = branch.BranchReferenceFormat().initialize(checkout,
239
279
                self)
240
280
            tree = checkout.create_workingtree(revision_id,
241
281
                from_branch=from_branch, hardlink=hardlink)
242
282
            return tree
243
283
        else:
244
284
            return self._create_heavyweight_checkout(to_location, revision_id,
245
 
            hardlink)
 
285
                hardlink)
246
286
 
247
 
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
 
287
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
248
288
                                     hardlink=False):
249
289
        """Create a new heavyweight checkout of this branch.
250
290
 
254
294
        :return: WorkingTree object of checkout.
255
295
        """
256
296
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
257
 
            to_location, force_new_tree=False, format=get_rich_root_format())
 
297
            to_location, force_new_tree=False)
258
298
        checkout = checkout_branch.bzrdir
259
299
        checkout_branch.bind(self)
260
 
        # pull up to the specified revision_id to set the initial 
 
300
        # pull up to the specified revision_id to set the initial
261
301
        # branch tip correctly, and seed it with history.
262
302
        checkout_branch.pull(self, stop_revision=revision_id)
263
303
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
272
312
 
273
313
    def _get_head(self):
274
314
        try:
275
 
            return self.repository._git.ref(self.name)
 
315
            return self.repository._git.ref(self.ref or "HEAD")
276
316
        except KeyError:
277
317
            return None
278
318
 
280
320
        self.set_last_revision(revid)
281
321
 
282
322
    def set_last_revision(self, revid):
283
 
        (newhead, self.mapping) = self.mapping.revision_id_bzr_to_foreign(
284
 
                revid)
 
323
        (newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
285
324
        self.head = newhead
286
325
 
287
326
    def _set_head(self, value):
288
327
        self._head = value
289
 
        self.repository._git.refs[self.name] = self._head
 
328
        self.repository._git.refs[self.ref or "HEAD"] = self._head
290
329
        self._clear_cached_state()
291
330
 
292
331
    head = property(_get_head, _set_head)
310
349
 
311
350
class GitBranchPullResult(branch.PullResult):
312
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
 
313
358
    def report(self, to_file):
314
359
        if not is_quiet():
315
360
            if self.old_revid == self.new_revid:
316
361
                to_file.write('No revisions to pull.\n')
317
 
            else:
318
 
                to_file.write('Now on revision %d (git sha: %s).\n' % 
 
362
            elif self.new_git_head is not None:
 
363
                to_file.write('Now on revision %d (git sha: %s).\n' %
319
364
                        (self.new_revno, self.new_git_head))
 
365
            else:
 
366
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
320
367
        self._show_tag_conficts(to_file)
321
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
 
322
398
 
323
399
class GitBranchPushResult(branch.BranchPushResult):
324
400
 
343
419
class InterFromGitBranch(branch.GenericInterBranch):
344
420
    """InterBranch implementation that pulls from Git into bzr."""
345
421
 
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
 
422
    @staticmethod
 
423
    def _get_branch_formats_to_test():
 
424
        return []
 
425
 
 
426
    @classmethod
 
427
    def _get_interrepo(self, source, target):
 
428
        return repository.InterRepository.get(source.repository,
 
429
            target.repository)
 
430
 
 
431
    @classmethod
 
432
    def is_compatible(cls, source, target):
 
433
        return (isinstance(source, GitBranch) and
 
434
                not isinstance(target, GitBranch) and
 
435
                (getattr(cls._get_interrepo(source, target), "fetch_objects", None) is not None))
 
436
 
 
437
    def _update_revisions(self, stop_revision=None, overwrite=False,
 
438
        graph=None, limit=None):
 
439
        """Like InterBranch.update_revisions(), but with additions.
 
440
 
 
441
        Compared to the `update_revisions()` below, this function takes a
 
442
        `limit` argument that limits how many git commits will be converted
 
443
        and returns the new git head.
 
444
        """
 
445
        interrepo = self._get_interrepo(self.source, self.target)
358
446
        def determine_wants(heads):
359
 
            if not self.source.name in heads:
360
 
                raise NoSuchRef(self.source.name, heads.keys())
 
447
            if self.source.ref is not None and not self.source.ref in heads:
 
448
                raise NoSuchRef(self.source.ref, heads.keys())
361
449
            if stop_revision is not None:
362
450
                self._last_revid = stop_revision
363
 
                self._head, mapping = self.source.repository.lookup_git_revid(
 
451
                head, mapping = self.source.repository.lookup_bzr_revision_id(
364
452
                    stop_revision)
365
453
            else:
366
 
                self._head = heads[self.source.name]
367
 
                self._last_revid = \
368
 
                    self.source.mapping.revision_id_foreign_to_bzr(self._head)
 
454
                if self.source.ref is not None:
 
455
                    head = heads[self.source.ref]
 
456
                else:
 
457
                    head = heads["HEAD"]
 
458
                self._last_revid = self.source.lookup_foreign_revision_id(head)
369
459
            if self.target.repository.has_revision(self._last_revid):
370
460
                return []
371
 
            return [self._head]
372
 
        interrepo.fetch_objects(determine_wants, self.source.mapping)
 
461
            return [head]
 
462
        pack_hint, head, refs = interrepo.fetch_objects(
 
463
            determine_wants, self.source.mapping, limit=limit)
 
464
        if (pack_hint is not None and
 
465
            self.target.repository._format.pack_compresses):
 
466
            self.target.repository.pack(hint=pack_hint)
 
467
        if head is not None:
 
468
            self._last_revid = self.source.lookup_foreign_revision_id(head)
373
469
        if overwrite:
374
470
            prev_last_revid = None
375
471
        else:
376
472
            prev_last_revid = self.target.last_revision()
377
 
        self.target.generate_revision_history(self._last_revid, prev_last_revid)
 
473
        self.target.generate_revision_history(self._last_revid,
 
474
            prev_last_revid)
 
475
        return head
 
476
 
 
477
    def update_revisions(self, stop_revision=None, overwrite=False,
 
478
                         graph=None):
 
479
        """See InterBranch.update_revisions()."""
 
480
        self._update_revisions(stop_revision, overwrite, graph)
378
481
 
379
482
    def pull(self, overwrite=False, stop_revision=None,
380
483
             possible_transports=None, _hook_master=None, run_hooks=True,
381
 
             _override_hook_target=None, local=False):
 
484
             _override_hook_target=None, local=False, limit=None):
382
485
        """See Branch.pull.
383
486
 
384
487
        :param _hook_master: Private parameter - set the branch to
388
491
            so it should not run its hooks.
389
492
        :param _override_hook_target: Private parameter - set the branch to be
390
493
            supplied as the target_branch to pull hooks.
 
494
        :param limit: Only import this many revisons.  `None`, the default,
 
495
            means import all revisions.
391
496
        """
392
497
        # This type of branch can't be bound.
393
498
        if local:
403
508
            # We assume that during 'pull' the target repository is closer than
404
509
            # the source one.
405
510
            graph = self.target.repository.get_graph(self.source.repository)
406
 
            result.old_revno, result.old_revid = \
 
511
            (result.old_revno, result.old_revid) = \
407
512
                self.target.last_revision_info()
408
 
            self.update_revisions(stop_revision, overwrite=overwrite, 
409
 
                graph=graph)
410
 
            result.new_git_head = self._head
 
513
            result.new_git_head = self._update_revisions(
 
514
                stop_revision, overwrite=overwrite, graph=graph, limit=limit)
411
515
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
412
516
                overwrite)
413
 
            result.new_revno, result.new_revid = self.target.last_revision_info()
 
517
            (result.new_revno, result.new_revid) = \
 
518
                self.target.last_revision_info()
414
519
            if _hook_master:
415
520
                result.master_branch = _hook_master
416
521
                result.local_branch = result.target_branch
430
535
        result.target_branch = self.target
431
536
        graph = self.target.repository.get_graph(self.source.repository)
432
537
        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
 
538
        result.new_git_head = self._update_revisions(
 
539
            stop_revision, overwrite=overwrite, graph=graph)
436
540
        result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
437
541
            overwrite)
438
542
        result.new_revno, result.new_revid = self.target.last_revision_info()
446
550
class InterGitLocalRemoteBranch(InterGitBranch):
447
551
    """InterBranch that copies from a local to a remote git branch."""
448
552
 
 
553
    @staticmethod
 
554
    def _get_branch_formats_to_test():
 
555
        return []
 
556
 
449
557
    @classmethod
450
558
    def is_compatible(self, source, target):
451
559
        from bzrlib.plugins.git.remote import RemoteGitBranch
452
 
        return (isinstance(source, LocalGitBranch) and 
 
560
        return (isinstance(source, LocalGitBranch) and
453
561
                isinstance(target, RemoteGitBranch))
454
562
 
455
563
    def _basic_push(self, overwrite=False, stop_revision=None):
 
564
        from dulwich.protocol import ZERO_SHA
456
565
        result = GitBranchPushResult()
457
566
        result.source_branch = self.source
458
567
        result.target_branch = self.target
460
569
            stop_revision = self.source.last_revision()
461
570
        # FIXME: Check for diverged branches
462
571
        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] }
 
572
            result.old_revid = self.target.lookup_foreign_revision_id(old_refs.get(self.target.ref, ZERO_SHA))
 
573
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
465
574
            result.new_revid = stop_revision
466
575
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
467
 
                refs["refs/tags/%s" % name] = sha
 
576
                refs[tag_name_to_ref(name)] = sha
468
577
            return refs
469
 
        self.target.repository.send_pack(get_changed_refs, 
470
 
                self.source.repository._git.object_store.generate_pack_contents)
 
578
        self.target.repository.send_pack(get_changed_refs,
 
579
            self.source.repository._git.object_store.generate_pack_contents)
471
580
        return result
472
581
 
473
582
 
474
583
class InterGitRemoteLocalBranch(InterGitBranch):
475
584
    """InterBranch that copies from a remote to a local git branch."""
476
585
 
 
586
    @staticmethod
 
587
    def _get_branch_formats_to_test():
 
588
        return []
 
589
 
477
590
    @classmethod
478
591
    def is_compatible(self, source, target):
479
592
        from bzrlib.plugins.git.remote import RemoteGitBranch
480
 
        return (isinstance(source, RemoteGitBranch) and 
 
593
        return (isinstance(source, RemoteGitBranch) and
481
594
                isinstance(target, LocalGitBranch))
482
595
 
483
596
    def _basic_push(self, overwrite=False, stop_revision=None):
492
605
        return result
493
606
 
494
607
    def update_tags(self, refs):
495
 
        for name, revid in extract_tags(refs, self.target.mapping).iteritems():
 
608
        for name, v in extract_tags(refs).iteritems():
 
609
            revid = self.target.lookup_foreign_revision_id(v)
496
610
            self.target.tags.set_tag(name, revid)
497
611
 
498
612
    def update_refs(self, stop_revision=None):
499
 
        interrepo = repository.InterRepository.get(self.source.repository, 
 
613
        interrepo = repository.InterRepository.get(self.source.repository,
500
614
            self.target.repository)
501
615
        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"])
 
616
            refs = interrepo.fetch(branches=["HEAD"])
 
617
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
504
618
        else:
505
 
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
619
            refs = interrepo.fetch(revision_id=stop_revision)
506
620
        return refs, stop_revision
507
621
 
508
 
    def pull(self, stop_revision=None, overwrite=False, 
509
 
        possible_transports=None, local=False):
 
622
    def pull(self, stop_revision=None, overwrite=False,
 
623
        possible_transports=None, run_hooks=True,local=False):
510
624
        # This type of branch can't be bound.
511
625
        if local:
512
626
            raise errors.LocalRequiresBoundBranch()
520
634
        result.new_revid = self.target.last_revision()
521
635
        return result
522
636
 
523
 
    
524
 
class InterToGitBranch(branch.InterBranch):
 
637
 
 
638
class InterToGitBranch(branch.GenericInterBranch):
525
639
    """InterBranch implementation that pulls from Git into bzr."""
526
640
 
 
641
    def __init__(self, source, target):
 
642
        super(InterToGitBranch, self).__init__(source, target)
 
643
        self.interrepo = repository.InterRepository.get(source.repository,
 
644
                                           target.repository)
 
645
 
 
646
    @staticmethod
 
647
    def _get_branch_formats_to_test():
 
648
        return []
 
649
 
527
650
    @classmethod
528
651
    def is_compatible(self, source, target):
529
 
        return (not isinstance(source, GitBranch) and 
 
652
        return (not isinstance(source, GitBranch) and
530
653
                isinstance(target, GitBranch))
531
654
 
532
655
    def update_revisions(self, *args, **kwargs):
533
656
        raise NoPushSupport()
534
657
 
535
 
    def push(self, overwrite=True, stop_revision=None, 
 
658
    def _get_new_refs(self, stop_revision=None):
 
659
        if stop_revision is None:
 
660
            stop_revision = self.source.last_revision()
 
661
        assert type(stop_revision) is str
 
662
        main_ref = self.target.ref or "refs/heads/master"
 
663
        refs = { main_ref: (None, stop_revision) }
 
664
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
665
            if self.source.repository.has_revision(revid):
 
666
                refs[tag_name_to_ref(name)] = (None, revid)
 
667
        return refs, main_ref
 
668
 
 
669
    def pull(self, overwrite=False, stop_revision=None, local=False,
 
670
             possible_transports=None):
 
671
        from dulwich.protocol import ZERO_SHA
 
672
        result = GitBranchPullResult()
 
673
        result.source_branch = self.source
 
674
        result.target_branch = self.target
 
675
        new_refs, main_ref = self._get_new_refs(stop_revision)
 
676
        def update_refs(old_refs):
 
677
            refs = dict(old_refs)
 
678
            # FIXME: Check for diverged branches
 
679
            refs.update(new_refs)
 
680
            return refs
 
681
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
 
682
        result.old_revid = self.target.lookup_foreign_revision_id(
 
683
            old_refs.get(main_ref, ZERO_SHA))
 
684
        result.new_revid = new_refs[main_ref]
 
685
        return result
 
686
 
 
687
    def push(self, overwrite=False, stop_revision=None,
536
688
             _override_hook_source_branch=None):
537
 
        raise NoPushSupport()
 
689
        from dulwich.protocol import ZERO_SHA
 
690
        result = GitBranchPushResult()
 
691
        result.source_branch = self.source
 
692
        result.target_branch = self.target
 
693
        new_refs, main_ref = self._get_new_refs(stop_revision)
 
694
        def update_refs(old_refs):
 
695
            refs = dict(old_refs)
 
696
            # FIXME: Check for diverged branches
 
697
            refs.update(new_refs)
 
698
            return refs
 
699
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
 
700
        result.old_revid = self.target.lookup_foreign_revision_id(
 
701
            old_refs.get(main_ref, ZERO_SHA))
 
702
        result.new_revid = new_refs[main_ref]
 
703
        return result
538
704
 
539
705
    def lossy_push(self, stop_revision=None):
540
706
        result = GitBranchPushResult()
541
707
        result.source_branch = self.source
542
708
        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
 
709
        new_refs, main_ref = self._get_new_refs(stop_revision)
 
710
        def update_refs(old_refs):
 
711
            refs = dict(old_refs)
 
712
            # FIXME: Check for diverged branches
 
713
            refs.update(new_refs)
 
714
            return refs
 
715
        result.revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(
 
716
            update_refs)
 
717
        result.old_revid = old_refs.get(self.target.ref, (None, NULL_REVISION))[1]
 
718
        result.new_revid = new_refs[main_ref][1]
562
719
        return result
563
720
 
564
721