/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 bzr.dev.

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,
23
29
    revision,
24
30
    tag,
25
31
    )
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
from bzrlib.decorators import (
 
33
    needs_read_lock,
 
34
    )
 
35
from bzrlib.trace import (
 
36
    mutter,
 
37
    )
 
38
 
 
39
from bzrlib.plugins.git.errors import (
 
40
    NoSuchRef,
 
41
    )
 
42
from bzrlib.plugins.git.foreign import (
 
43
    ForeignBranch,
 
44
    )
 
45
from bzrlib.plugins.git.errors import (
 
46
    LightWeightCheckoutsNotSupported,
 
47
    )
 
48
 
 
49
 
 
50
class LocalGitTagDict(tag.BasicTags):
 
51
    """Dictionary with tags in a local repository."""
38
52
 
39
53
    def __init__(self, branch):
40
54
        self.branch = branch
48
62
                v = obj.object[1]
49
63
                obj = self.repository._git.get_object(v)
50
64
            if not isinstance(obj, Commit):
51
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
65
                mutter("Tag %s points at object %r that is not a commit, "
 
66
                       "ignoring", k, obj)
52
67
                continue
53
68
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
54
69
        return ret
65
80
        # do not provide a BranchDataConfig
66
81
        self.option_sources = self.option_sources[0], self.option_sources[2]
67
82
 
68
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
 
83
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
 
84
            warn_masked=False):
69
85
        """Force local to True"""
70
 
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
 
86
        config.BranchConfig.set_user_option(self, name, value,
 
87
            store=config.STORE_LOCATION, warn_masked=warn_masked)
71
88
 
72
89
 
73
90
class GitBranchFormat(branch.BranchFormat):
78
95
    def supports_tags(self):
79
96
        return True
80
97
 
 
98
    def make_tags(self, branch):
 
99
        if getattr(branch.repository, "get_refs", None) is not None:
 
100
            from bzrlib.plugins.git.remote import RemoteGitTagDict
 
101
            return RemoteGitTagDict(branch)
 
102
        else:
 
103
            return LocalGitTagDict(branch)
 
104
 
81
105
 
82
106
class GitBranch(ForeignBranch):
83
107
    """An adapter to git repositories for bzr Branch objects."""
84
108
 
85
109
    def __init__(self, bzrdir, repository, name, head, lockfiles):
86
110
        self.repository = repository
 
111
        self._format = GitBranchFormat()
87
112
        super(GitBranch, self).__init__(repository.get_mapping())
88
113
        self.control_files = lockfiles
89
114
        self.bzrdir = bzrdir
90
115
        self.name = name
91
116
        self.head = head
92
117
        self.base = bzrdir.transport.base
93
 
        self._format = GitBranchFormat()
94
118
 
95
119
    def dpull(self, source, stop_revision=None):
96
120
        if stop_revision is None:
97
121
            stop_revision = source.last_revision()
98
122
        # FIXME: Check for diverged branches
99
123
        revidmap = self.repository.dfetch(source.repository, stop_revision)
100
 
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(revidmap[stop_revision])
 
124
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(
 
125
            revidmap[stop_revision])
 
126
        self.repository._git.set_ref(self.name, self.head)
101
127
        return revidmap
102
128
 
103
129
    def lock_write(self):
125
151
 
126
152
 
127
153
class LocalGitBranch(GitBranch):
 
154
    """A local Git branch."""
128
155
 
129
156
    @needs_read_lock
130
157
    def last_revision(self):
133
160
            return revision.NULL_REVISION
134
161
        return self.mapping.revision_id_foreign_to_bzr(self.head)
135
162
 
136
 
    def create_checkout(self, to_location, revision_id=None, 
137
 
                        lightweight=False, accelerator_tree=None, hardlink=False):
 
163
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
 
164
        accelerator_tree=None, hardlink=False):
138
165
        if lightweight:
139
166
            raise LightWeightCheckoutsNotSupported()
140
 
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
167
        return self._create_heavyweight_checkout(to_location, revision_id,
 
168
            hardlink)
141
169
 
142
170
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
143
171
                                     hardlink=False):
157
185
        checkout_branch.pull(self, stop_revision=revision_id)
158
186
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
159
187
 
160
 
    def _make_tags(self):
161
 
        return GitTagDict(self)
162
 
 
163
188
    def _gen_revision_history(self):
164
189
        if self.head is None:
165
190
            return []
166
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
191
        ret = list(self.repository.iter_reverse_revision_history(
 
192
            self.last_revision()))
167
193
        ret.reverse()
168
194
        return ret
169
195
 
183
209
    def supports_tags(self):
184
210
        return True
185
211
 
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
212
 
194
213
class InterGitGenericBranch(branch.InterBranch):
 
214
    """InterBranch implementation that pulls from Git into bzr."""
195
215
 
196
216
    @classmethod
197
217
    def is_compatible(self, source, target):
201
221
        graph=None):
202
222
        """See InterBranch.update_revisions()."""
203
223
        # TODO: stop_revision, overwrite
204
 
        interrepo = repository.InterRepository.get(self.source.repository, self.target.repository)
 
224
        interrepo = repository.InterRepository.get(self.source.repository, 
 
225
            self.target.repository)
205
226
        self._last_revid = None
206
227
        def determine_wants(heads):
207
228
            if not self.source.name in heads:
208
 
                raise BzrError("No such remote branch '%s', found: %r" % (
209
 
                    self.source.name, heads.keys()))
 
229
                raise NoSuchRef(self.source.name, heads.keys())
210
230
            head = heads[self.source.name]
211
 
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
 
231
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
 
232
                head)
212
233
            if self.target.repository.has_revision(self._last_revid):
213
234
                return []
214
235
            return [head]