/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

Support tag refs.

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
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.trace import (
 
39
    is_quiet,
 
40
    mutter,
 
41
    )
 
42
 
 
43
from bzrlib.plugins.git import (
 
44
    get_rich_root_format,
 
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
    )
 
57
 
 
58
from bzrlib.foreign import ForeignBranch
 
59
 
 
60
 
 
61
class GitPullResult(branch.PullResult):
 
62
 
 
63
    def _lookup_revno(self, revid):
 
64
        assert isinstance(revid, str), "was %r" % revid
 
65
        # Try in source branch first, it'll be faster
 
66
        return self.target_branch.revision_id_to_revno(revid)
 
67
 
 
68
    @property
 
69
    def old_revno(self):
 
70
        return self._lookup_revno(self.old_revid)
 
71
 
 
72
    @property
 
73
    def new_revno(self):
 
74
        return self._lookup_revno(self.new_revid)
 
75
 
 
76
 
 
77
class LocalGitTagDict(tag.BasicTags):
 
78
    """Dictionary with tags in a local repository."""
38
79
 
39
80
    def __init__(self, branch):
40
81
        self.branch = branch
42
83
 
43
84
    def get_tag_dict(self):
44
85
        ret = {}
45
 
        for k,v in self.repository._git.tags.iteritems():
46
 
            obj = self.repository._git.get_object(v)
 
86
        for k,v in extract_tags(self.repository._git.get_refs()).iteritems():
 
87
            try:
 
88
                obj = self.repository._git[v]
 
89
            except KeyError:
 
90
                mutter("Tag %s points at unknown object %s, ignoring", v, obj)
 
91
                continue
47
92
            while isinstance(obj, Tag):
48
93
                v = obj.object[1]
49
 
                obj = self.repository._git.get_object(v)
 
94
                obj = self.repository._git[v]
50
95
            if not isinstance(obj, Commit):
51
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
96
                mutter("Tag %s points at object %r that is not a commit, "
 
97
                       "ignoring", k, obj)
52
98
                continue
53
99
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
54
100
        return ret
55
101
 
 
102
    def _set_tag_dict(self, to_dict):
 
103
        extra = set(self.repository._git.get_refs().keys())
 
104
        for k, revid in to_dict.iteritems():
 
105
            name = "refs/tags/%s" % k
 
106
            if name in extra:
 
107
                extra.remove(name)
 
108
            self.set_tag(k, revid)
 
109
        for name in extra:
 
110
            if name.startswith("refs/tags/"):
 
111
                del self.repository._git[name]
 
112
        
56
113
    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)
 
114
        self.repository._git.refs["refs/tags/%s" % name], _ = \
 
115
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
 
116
 
 
117
 
 
118
class DictTagDict(LocalGitTagDict):
 
119
 
 
120
    def __init__(self, branch, tags):
 
121
        super(DictTagDict, self).__init__(branch)
 
122
        self._tags = tags
 
123
 
 
124
    def get_tag_dict(self):
 
125
        return self._tags
71
126
 
72
127
 
73
128
class GitBranchFormat(branch.BranchFormat):
75
130
    def get_format_description(self):
76
131
        return 'Git Branch'
77
132
 
 
133
    def network_name(self):
 
134
        return "git"
 
135
 
78
136
    def supports_tags(self):
79
137
        return True
80
138
 
 
139
    def get_foreign_tests_branch_factory(self):
 
140
        from bzrlib.plugins.git.tests.test_branch import ForeignTestsBranchFactory
 
141
        return ForeignTestsBranchFactory()
 
142
 
 
143
    def make_tags(self, branch):
 
144
        if getattr(branch.repository, "get_refs", None) is not None:
 
145
            from bzrlib.plugins.git.remote import RemoteGitTagDict
 
146
            return RemoteGitTagDict(branch)
 
147
        else:
 
148
            return LocalGitTagDict(branch)
 
149
 
81
150
 
82
151
class GitBranch(ForeignBranch):
83
152
    """An adapter to git repositories for bzr Branch objects."""
84
153
 
85
 
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
154
    def __init__(self, bzrdir, repository, ref, lockfiles, tagsdict=None):
86
155
        self.repository = repository
87
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
156
        self._format = GitBranchFormat()
88
157
        self.control_files = lockfiles
89
158
        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
 
159
        super(GitBranch, self).__init__(repository.get_mapping())
 
160
        if tagsdict is not None:
 
161
            self.tags = DictTagDict(self, tagsdict)
 
162
        self.ref = ref
 
163
        self.name = ref_to_branch_name(ref)
 
164
        self._head = None
 
165
        self.base = bzrdir.root_transport.base
 
166
 
 
167
    def _get_checkout_format(self):
 
168
        """Return the most suitable metadir for a checkout of this branch.
 
169
        Weaves are used if this branch's repository uses weaves.
 
170
        """
 
171
        return get_rich_root_format()
 
172
 
 
173
    def get_child_submit_format(self):
 
174
        """Return the preferred format of submissions to this branch."""
 
175
        ret = self.get_config().get_user_option("child_submit_format")
 
176
        if ret is not None:
 
177
            return ret
 
178
        return "git"
 
179
 
 
180
    def _get_nick(self, local=False, possible_master_transports=None):
 
181
        """Find the nick name for this branch.
 
182
 
 
183
        :return: Branch nick
 
184
        """
 
185
        return self.name
 
186
 
 
187
    def _set_nick(self, nick):
 
188
        raise NotImplementedError
 
189
 
 
190
    nick = property(_get_nick, _set_nick)
 
191
 
 
192
    def __repr__(self):
 
193
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
 
194
            self.ref)
 
195
 
 
196
    def generate_revision_history(self, revid, old_revid=None):
 
197
        # FIXME: Check that old_revid is in the ancestry of revid
 
198
        newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
 
199
        self._set_head(newhead)
102
200
 
103
201
    def lock_write(self):
104
202
        self.control_files.lock_write()
105
203
 
106
204
    def get_stacked_on_url(self):
107
205
        # Git doesn't do stacking (yet...)
108
 
        return None
 
206
        raise errors.UnstackableBranchFormat(self._format, self.base)
109
207
 
110
208
    def get_parent(self):
111
209
        """See Branch.get_parent()."""
 
210
        # FIXME: Set "origin" url from .git/config ?
112
211
        return None
113
212
 
114
213
    def set_parent(self, url):
 
214
        # FIXME: Set "origin" url in .git/config ?
115
215
        pass
116
216
 
117
217
    def lock_read(self):
118
218
        self.control_files.lock_read()
119
219
 
 
220
    def is_locked(self):
 
221
        return self.control_files.is_locked()
 
222
 
120
223
    def unlock(self):
121
224
        self.control_files.unlock()
122
225
 
123
226
    def get_physical_lock_status(self):
124
227
        return False
125
228
 
126
 
 
127
 
class LocalGitBranch(GitBranch):
128
 
 
129
229
    @needs_read_lock
130
230
    def last_revision(self):
131
231
        # perhaps should escape this ?
133
233
            return revision.NULL_REVISION
134
234
        return self.mapping.revision_id_foreign_to_bzr(self.head)
135
235
 
136
 
    def create_checkout(self, to_location, revision_id=None, 
137
 
                        lightweight=False, accelerator_tree=None, hardlink=False):
 
236
    def _basic_push(self, target, overwrite=False, stop_revision=None):
 
237
        return branch.InterBranch.get(self, target)._basic_push(
 
238
            overwrite, stop_revision)
 
239
 
 
240
 
 
241
class LocalGitBranch(GitBranch):
 
242
    """A local Git branch."""
 
243
 
 
244
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
 
245
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
 
246
              lockfiles, tagsdict)
 
247
        if not name in repository._git.get_refs().keys():
 
248
            raise errors.NotBranchError(self.base)
 
249
 
 
250
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
 
251
        accelerator_tree=None, hardlink=False):
138
252
        if lightweight:
139
 
            raise LightWeightCheckoutsNotSupported()
140
 
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
253
            t = transport.get_transport(to_location)
 
254
            t.ensure_base()
 
255
            format = self._get_checkout_format()
 
256
            checkout = format.initialize_on_transport(t)
 
257
            from_branch = branch.BranchReferenceFormat().initialize(checkout,
 
258
                self)
 
259
            tree = checkout.create_workingtree(revision_id,
 
260
                from_branch=from_branch, hardlink=hardlink)
 
261
            return tree
 
262
        else:
 
263
            return self._create_heavyweight_checkout(to_location, revision_id,
 
264
            hardlink)
141
265
 
142
 
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
 
266
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
143
267
                                     hardlink=False):
144
268
        """Create a new heavyweight checkout of this branch.
145
269
 
148
272
        :param hardlink: Whether to hardlink
149
273
        :return: WorkingTree object of checkout.
150
274
        """
151
 
        checkout_branch = BzrDir.create_branch_convenience(
 
275
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
152
276
            to_location, force_new_tree=False, format=get_rich_root_format())
153
277
        checkout = checkout_branch.bzrdir
154
278
        checkout_branch.bind(self)
155
 
        # pull up to the specified revision_id to set the initial 
 
279
        # pull up to the specified revision_id to set the initial
156
280
        # branch tip correctly, and seed it with history.
157
281
        checkout_branch.pull(self, stop_revision=revision_id)
158
282
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
159
283
 
160
 
    def _make_tags(self):
161
 
        return GitTagDict(self)
162
 
 
163
284
    def _gen_revision_history(self):
164
285
        if self.head is None:
165
286
            return []
166
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
287
        ret = list(self.repository.iter_reverse_revision_history(
 
288
            self.last_revision()))
167
289
        ret.reverse()
168
290
        return ret
169
291
 
 
292
    def _get_head(self):
 
293
        try:
 
294
            return self.repository._git.ref(self.ref)
 
295
        except KeyError:
 
296
            return None
 
297
 
 
298
    def set_last_revision_info(self, revno, revid):
 
299
        self.set_last_revision(revid)
 
300
 
 
301
    def set_last_revision(self, revid):
 
302
        (newhead, self.mapping) = self.mapping.revision_id_bzr_to_foreign(
 
303
                revid)
 
304
        self.head = newhead
 
305
 
 
306
    def _set_head(self, value):
 
307
        self._head = value
 
308
        self.repository._git.refs[self.ref] = self._head
 
309
        self._clear_cached_state()
 
310
 
 
311
    head = property(_get_head, _set_head)
 
312
 
170
313
    def get_config(self):
171
314
        return GitBranchConfig(self)
172
315
 
183
326
    def supports_tags(self):
184
327
        return True
185
328
 
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
 
329
 
 
330
class GitBranchPullResult(branch.PullResult):
 
331
 
 
332
    def report(self, to_file):
 
333
        if not is_quiet():
 
334
            if self.old_revid == self.new_revid:
 
335
                to_file.write('No revisions to pull.\n')
 
336
            elif self.new_git_head is not None:
 
337
                to_file.write('Now on revision %d (git sha: %s).\n' %
 
338
                        (self.new_revno, self.new_git_head))
 
339
            else:
 
340
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
 
341
        self._show_tag_conficts(to_file)
 
342
 
 
343
 
 
344
class GitBranchPushResult(branch.BranchPushResult):
 
345
 
 
346
    def _lookup_revno(self, revid):
 
347
        assert isinstance(revid, str), "was %r" % revid
 
348
        # Try in source branch first, it'll be faster
 
349
        try:
 
350
            return self.source_branch.revision_id_to_revno(revid)
 
351
        except errors.NoSuchRevision:
 
352
            # FIXME: Check using graph.find_distance_to_null() ?
 
353
            return self.target_branch.revision_id_to_revno(revid)
 
354
 
 
355
    @property
 
356
    def old_revno(self):
 
357
        return self._lookup_revno(self.old_revid)
 
358
 
 
359
    @property
 
360
    def new_revno(self):
 
361
        return self._lookup_revno(self.new_revid)
 
362
 
 
363
 
 
364
class InterFromGitBranch(branch.GenericInterBranch):
 
365
    """InterBranch implementation that pulls from Git into bzr."""
 
366
 
 
367
    @classmethod
 
368
    def _get_interrepo(self, source, target):
 
369
        return repository.InterRepository.get(source.repository,
 
370
            target.repository)
 
371
 
 
372
    @classmethod
 
373
    def is_compatible(cls, source, target):
 
374
        return (isinstance(source, GitBranch) and
 
375
                not isinstance(target, GitBranch) and
 
376
                (getattr(cls._get_interrepo(source, target), "fetch_objects", None) is not None))
 
377
 
 
378
    def _update_revisions(self, stop_revision=None, overwrite=False,
 
379
        graph=None, limit=None):
 
380
        """Like InterBranch.update_revisions(), but with additions.
 
381
 
 
382
        Compared to the `update_revisions()` below, this function takes a
 
383
        `limit` argument that limits how many git commits will be converted
 
384
        and returns the new git head.
 
385
        """
 
386
        interrepo = self._get_interrepo(self.source, self.target)
206
387
        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)
 
388
            if not self.source.ref in heads:
 
389
                raise NoSuchRef(self.source.ref, heads.keys())
 
390
            if stop_revision is not None:
 
391
                self._last_revid = stop_revision
 
392
                head, mapping = self.source.repository.lookup_bzr_revision_id(
 
393
                    stop_revision)
 
394
            else:
 
395
                head = heads[self.source.ref]
 
396
                self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
 
397
                    head)
212
398
            if self.target.repository.has_revision(self._last_revid):
213
399
                return []
214
400
            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)
 
401
        pack_hint, head = interrepo.fetch_objects(
 
402
            determine_wants, self.source.mapping, limit=limit)
 
403
        if pack_hint is not None and self.target.repository._format.pack_compresses:
 
404
            self.target.repository.pack(hint=pack_hint)
 
405
        if head is not None:
 
406
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
 
407
        if overwrite:
 
408
            prev_last_revid = None
 
409
        else:
 
410
            prev_last_revid = self.target.last_revision()
 
411
        self.target.generate_revision_history(self._last_revid,
 
412
            prev_last_revid)
 
413
        return head
 
414
 
 
415
    def update_revisions(self, stop_revision=None, overwrite=False,
 
416
                         graph=None):
 
417
        """See InterBranch.update_revisions()."""
 
418
        self._update_revisions(stop_revision, overwrite, graph)
 
419
 
 
420
    def pull(self, overwrite=False, stop_revision=None,
 
421
             possible_transports=None, _hook_master=None, run_hooks=True,
 
422
             _override_hook_target=None, local=False, limit=None):
 
423
        """See Branch.pull.
 
424
 
 
425
        :param _hook_master: Private parameter - set the branch to
 
426
            be supplied as the master to pull hooks.
 
427
        :param run_hooks: Private parameter - if false, this branch
 
428
            is being called because it's the master of the primary branch,
 
429
            so it should not run its hooks.
 
430
        :param _override_hook_target: Private parameter - set the branch to be
 
431
            supplied as the target_branch to pull hooks.
 
432
        :param limit: Only import this many revisons.  `None`, the default,
 
433
            means import all revisions.
 
434
        """
 
435
        # This type of branch can't be bound.
 
436
        if local:
 
437
            raise errors.LocalRequiresBoundBranch()
 
438
        result = GitBranchPullResult()
 
439
        result.source_branch = self.source
 
440
        if _override_hook_target is None:
 
441
            result.target_branch = self.target
 
442
        else:
 
443
            result.target_branch = _override_hook_target
 
444
        self.source.lock_read()
 
445
        try:
 
446
            # We assume that during 'pull' the target repository is closer than
 
447
            # the source one.
 
448
            graph = self.target.repository.get_graph(self.source.repository)
 
449
            (result.old_revno, result.old_revid) = \
 
450
                self.target.last_revision_info()
 
451
            result.new_git_head = self._update_revisions(
 
452
                stop_revision, overwrite=overwrite, graph=graph, limit=limit)
 
453
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
 
454
                overwrite)
 
455
            (result.new_revno, result.new_revid) = \
 
456
                self.target.last_revision_info()
 
457
            if _hook_master:
 
458
                result.master_branch = _hook_master
 
459
                result.local_branch = result.target_branch
 
460
            else:
 
461
                result.master_branch = result.target_branch
 
462
                result.local_branch = None
 
463
            if run_hooks:
 
464
                for hook in branch.Branch.hooks['post_pull']:
 
465
                    hook(result)
 
466
        finally:
 
467
            self.source.unlock()
 
468
        return result
 
469
 
 
470
    def _basic_push(self, overwrite=False, stop_revision=None):
 
471
        result = branch.BranchPushResult()
 
472
        result.source_branch = self.source
 
473
        result.target_branch = self.target
 
474
        graph = self.target.repository.get_graph(self.source.repository)
 
475
        result.old_revno, result.old_revid = self.target.last_revision_info()
 
476
        result.new_git_head = self._update_revisions(
 
477
            stop_revision, overwrite=overwrite, graph=graph)
 
478
        result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
 
479
            overwrite)
 
480
        result.new_revno, result.new_revid = self.target.last_revision_info()
 
481
        return result
 
482
 
 
483
 
 
484
class InterGitBranch(branch.GenericInterBranch):
 
485
    """InterBranch implementation that pulls between Git branches."""
 
486
 
 
487
 
 
488
class InterGitLocalRemoteBranch(InterGitBranch):
 
489
    """InterBranch that copies from a local to a remote git branch."""
 
490
 
 
491
    @classmethod
 
492
    def is_compatible(self, source, target):
 
493
        from bzrlib.plugins.git.remote import RemoteGitBranch
 
494
        return (isinstance(source, LocalGitBranch) and
 
495
                isinstance(target, RemoteGitBranch))
 
496
 
 
497
    def _basic_push(self, overwrite=False, stop_revision=None):
 
498
        result = GitBranchPushResult()
 
499
        result.source_branch = self.source
 
500
        result.target_branch = self.target
 
501
        if stop_revision is None:
 
502
            stop_revision = self.source.last_revision()
 
503
        # FIXME: Check for diverged branches
 
504
        def get_changed_refs(old_refs):
 
505
            result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get(self.target.ref, "0" * 40))
 
506
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
 
507
            result.new_revid = stop_revision
 
508
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
 
509
                refs["refs/tags/%s" % name] = sha
 
510
            return refs
 
511
        self.target.repository.send_pack(get_changed_refs,
 
512
            self.source.repository._git.object_store.generate_pack_contents)
 
513
        return result
 
514
 
 
515
 
 
516
class InterGitRemoteLocalBranch(InterGitBranch):
 
517
    """InterBranch that copies from a remote to a local git branch."""
 
518
 
 
519
    @classmethod
 
520
    def is_compatible(self, source, target):
 
521
        from bzrlib.plugins.git.remote import RemoteGitBranch
 
522
        return (isinstance(source, RemoteGitBranch) and
 
523
                isinstance(target, LocalGitBranch))
 
524
 
 
525
    def _basic_push(self, overwrite=False, stop_revision=None):
 
526
        result = branch.BranchPushResult()
 
527
        result.source_branch = self.source
 
528
        result.target_branch = self.target
 
529
        result.old_revid = self.target.last_revision()
 
530
        refs, stop_revision = self.update_refs(stop_revision)
 
531
        self.target.generate_revision_history(stop_revision, result.old_revid)
 
532
        self.update_tags(refs)
 
533
        result.new_revid = self.target.last_revision()
 
534
        return result
 
535
 
 
536
    def update_tags(self, refs):
 
537
        for name, v in extract_tags(refs).iteritems():
 
538
            revid = self.target.mapping.revision_id_foreign_to_bzr(v)
 
539
            self.target.tags.set_tag(name, revid)
 
540
 
 
541
    def update_refs(self, stop_revision=None):
 
542
        interrepo = repository.InterRepository.get(self.source.repository,
 
543
            self.target.repository)
 
544
        if stop_revision is None:
 
545
            refs = interrepo.fetch_refs(branches=["HEAD"])
 
546
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
 
547
        else:
 
548
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
549
        return refs, stop_revision
 
550
 
 
551
    def pull(self, stop_revision=None, overwrite=False,
 
552
        possible_transports=None, run_hooks=True,local=False):
 
553
        # This type of branch can't be bound.
 
554
        if local:
 
555
            raise errors.LocalRequiresBoundBranch()
 
556
        result = GitPullResult()
 
557
        result.source_branch = self.source
 
558
        result.target_branch = self.target
 
559
        result.old_revid = self.target.last_revision()
 
560
        refs, stop_revision = self.update_refs(stop_revision)
 
561
        self.target.generate_revision_history(stop_revision, result.old_revid)
 
562
        self.update_tags(refs)
 
563
        result.new_revid = self.target.last_revision()
 
564
        return result
 
565
 
 
566
 
 
567
class InterToGitBranch(branch.InterBranch):
 
568
    """InterBranch implementation that pulls from Git into bzr."""
 
569
 
 
570
    @staticmethod
 
571
    def _get_branch_formats_to_test():
 
572
        return None, None
 
573
 
 
574
    @classmethod
 
575
    def is_compatible(self, source, target):
 
576
        return (not isinstance(source, GitBranch) and
 
577
                isinstance(target, GitBranch))
 
578
 
 
579
    def update_revisions(self, *args, **kwargs):
 
580
        raise NoPushSupport()
 
581
 
 
582
    def push(self, overwrite=True, stop_revision=None,
 
583
             _override_hook_source_branch=None):
 
584
        raise NoPushSupport()
 
585
 
 
586
    def lossy_push(self, stop_revision=None):
 
587
        result = GitBranchPushResult()
 
588
        result.source_branch = self.source
 
589
        result.target_branch = self.target
 
590
        if stop_revision is None:
 
591
            stop_revision = self.source.last_revision()
 
592
        # FIXME: Check for diverged branches
 
593
        refs = { self.target.ref: stop_revision }
 
594
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
595
            if self.source.repository.has_revision(revid):
 
596
                refs["refs/tags/%s" % name] = revid
 
597
        revidmap, old_refs, new_refs = self.target.repository.dfetch_refs(
 
598
            self.source.repository, refs)
 
599
        result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(
 
600
            old_refs.get(self.target.ref, "0" * 40))
 
601
        result.new_revid = self.target.mapping.revision_id_foreign_to_bzr(
 
602
            new_refs[self.target.ref])
 
603
        result.revidmap = revidmap
 
604
        return result
 
605
 
 
606
 
 
607
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
 
608
branch.InterBranch.register_optimiser(InterFromGitBranch)
 
609
branch.InterBranch.register_optimiser(InterToGitBranch)
 
610
branch.InterBranch.register_optimiser(InterGitLocalRemoteBranch)