/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

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