/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

Simply refer to bzr's docs in HACKING.

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