/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 pushing git->git.

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