/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

Add description of git-v1 mapping.

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
    foreign,
22
29
    repository,
23
30
    revision,
24
31
    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):
 
32
    transport,
 
33
    )
 
34
from bzrlib.decorators import (
 
35
    needs_read_lock,
 
36
    )
 
37
from bzrlib.trace import (
 
38
    mutter,
 
39
    )
 
40
 
 
41
from bzrlib.plugins.git.errors import (
 
42
    NoSuchRef,
 
43
    )
 
44
 
 
45
 
 
46
class LocalGitTagDict(tag.BasicTags):
 
47
    """Dictionary with tags in a local repository."""
38
48
 
39
49
    def __init__(self, branch):
40
50
        self.branch = branch
48
58
                v = obj.object[1]
49
59
                obj = self.repository._git.get_object(v)
50
60
            if not isinstance(obj, Commit):
51
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
61
                mutter("Tag %s points at object %r that is not a commit, "
 
62
                       "ignoring", k, obj)
52
63
                continue
53
64
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
54
65
        return ret
65
76
        # do not provide a BranchDataConfig
66
77
        self.option_sources = self.option_sources[0], self.option_sources[2]
67
78
 
68
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
 
79
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
 
80
            warn_masked=False):
69
81
        """Force local to True"""
70
 
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
 
82
        config.BranchConfig.set_user_option(self, name, value,
 
83
            store=config.STORE_LOCATION, warn_masked=warn_masked)
71
84
 
72
85
 
73
86
class GitBranchFormat(branch.BranchFormat):
78
91
    def supports_tags(self):
79
92
        return True
80
93
 
81
 
 
82
 
class GitBranch(ForeignBranch):
 
94
    def make_tags(self, branch):
 
95
        if getattr(branch.repository, "get_refs", None) is not None:
 
96
            from bzrlib.plugins.git.remote import RemoteGitTagDict
 
97
            return RemoteGitTagDict(branch)
 
98
        else:
 
99
            return LocalGitTagDict(branch)
 
100
 
 
101
 
 
102
class GitBranch(foreign.ForeignBranch):
83
103
    """An adapter to git repositories for bzr Branch objects."""
84
104
 
85
105
    def __init__(self, bzrdir, repository, name, head, lockfiles):
86
106
        self.repository = repository
87
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
107
        self._format = GitBranchFormat()
88
108
        self.control_files = lockfiles
89
109
        self.bzrdir = bzrdir
 
110
        super(GitBranch, self).__init__(repository.get_mapping())
90
111
        self.name = name
91
112
        self.head = head
92
113
        self.base = bzrdir.transport.base
93
 
        self._format = GitBranchFormat()
 
114
 
 
115
    def _get_nick(self, local=False, possible_master_transports=None):
 
116
        """Find the nick name for this branch.
 
117
 
 
118
        :return: Branch nick
 
119
        """
 
120
        return self.name
 
121
 
 
122
    nick = property(_get_nick)
94
123
 
95
124
    def dpull(self, source, stop_revision=None):
96
125
        if stop_revision is None:
97
126
            stop_revision = source.last_revision()
98
127
        # FIXME: Check for diverged branches
99
128
        revidmap = self.repository.dfetch(source.repository, stop_revision)
100
 
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(revidmap[stop_revision])
 
129
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(
 
130
            revidmap[stop_revision])
 
131
        self.repository._git.set_ref(self.name, self.head)
101
132
        return revidmap
102
133
 
103
134
    def lock_write(self):
109
140
 
110
141
    def get_parent(self):
111
142
        """See Branch.get_parent()."""
 
143
        # FIXME: Set "origin" url from .git/config ?
112
144
        return None
113
145
 
114
146
    def set_parent(self, url):
 
147
        # FIXME: Set "origin" url in .git/config ?
115
148
        pass
116
149
 
117
150
    def lock_read(self):
125
158
 
126
159
 
127
160
class LocalGitBranch(GitBranch):
 
161
    """A local Git branch."""
128
162
 
129
163
    @needs_read_lock
130
164
    def last_revision(self):
133
167
            return revision.NULL_REVISION
134
168
        return self.mapping.revision_id_foreign_to_bzr(self.head)
135
169
 
136
 
    def create_checkout(self, to_location, revision_id=None, 
137
 
                        lightweight=False, accelerator_tree=None, hardlink=False):
 
170
    def _get_checkout_format(self):
 
171
        """Return the most suitable metadir for a checkout of this branch.
 
172
        Weaves are used if this branch's repository uses weaves.
 
173
        """
 
174
        format = self.repository.bzrdir.checkout_metadir()
 
175
        format.set_branch_format(self._format)
 
176
        return format
 
177
 
 
178
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
 
179
        accelerator_tree=None, hardlink=False):
138
180
        if lightweight:
139
 
            raise LightWeightCheckoutsNotSupported()
140
 
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
181
            t = transport.get_transport(to_location)
 
182
            t.ensure_base()
 
183
            format = self._get_checkout_format()
 
184
            checkout = format.initialize_on_transport(t)
 
185
            from_branch = branch.BranchReferenceFormat().initialize(checkout, 
 
186
                self)
 
187
            tree = checkout.create_workingtree(revision_id,
 
188
                from_branch=from_branch, hardlink=hardlink)
 
189
            return tree
 
190
        else:
 
191
            return self._create_heavyweight_checkout(to_location, revision_id,
 
192
            hardlink)
141
193
 
142
194
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
143
195
                                     hardlink=False):
157
209
        checkout_branch.pull(self, stop_revision=revision_id)
158
210
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
159
211
 
160
 
    def _make_tags(self):
161
 
        return GitTagDict(self)
162
 
 
163
212
    def _gen_revision_history(self):
164
213
        if self.head is None:
165
214
            return []
166
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
215
        ret = list(self.repository.iter_reverse_revision_history(
 
216
            self.last_revision()))
167
217
        ret.reverse()
168
218
        return ret
169
219
 
183
233
    def supports_tags(self):
184
234
        return True
185
235
 
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
236
 
194
237
class InterGitGenericBranch(branch.InterBranch):
 
238
    """InterBranch implementation that pulls from Git into bzr."""
195
239
 
196
240
    @classmethod
197
241
    def is_compatible(self, source, target):
200
244
    def update_revisions(self, stop_revision=None, overwrite=False,
201
245
        graph=None):
202
246
        """See InterBranch.update_revisions()."""
203
 
        # TODO: stop_revision, overwrite
204
 
        interrepo = repository.InterRepository.get(self.source.repository, self.target.repository)
 
247
        interrepo = repository.InterRepository.get(self.source.repository, 
 
248
            self.target.repository)
205
249
        self._last_revid = None
206
250
        def determine_wants(heads):
207
251
            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)
 
252
                raise NoSuchRef(self.source.name, heads.keys())
 
253
            if stop_revision is not None:
 
254
                self._last_revid = stop_revision
 
255
                head, mapping = self.source.repository.lookup_git_revid(
 
256
                    stop_revision)
 
257
            else:
 
258
                head = heads[self.source.name]
 
259
                self._last_revid = \
 
260
                    self.source.mapping.revision_id_foreign_to_bzr(head)
212
261
            if self.target.repository.has_revision(self._last_revid):
213
262
                return []
214
263
            return [head]
215
264
        interrepo.fetch_objects(determine_wants, self.source.mapping)
216
 
        self.target.generate_revision_history(self._last_revid)
 
265
        if overwrite:
 
266
            prev_last_revid = None
 
267
        else:
 
268
            prev_last_revid = self.target.last_revision()
 
269
        self.target.generate_revision_history(self._last_revid, prev_last_revid)
217
270
 
218
271
 
219
272
branch.InterBranch.register_optimiser(InterGitGenericBranch)