/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

Fix support for older versions of Dulwich.

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