/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

Partially fix pull.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
19
19
from bzrlib import (
20
20
    branch,
21
21
    config,
 
22
    repository,
22
23
    revision,
 
24
    tag,
23
25
    )
24
26
from bzrlib.decorators import needs_read_lock
25
 
 
26
 
from bzrlib.plugins.git import ids
 
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):
 
38
 
 
39
    def __init__(self, branch):
 
40
        self.branch = branch
 
41
        self.repository = branch.repository
 
42
 
 
43
    def get_tag_dict(self):
 
44
        ret = {}
 
45
        for k,v in self.repository._git.tags.iteritems():
 
46
            obj = self.repository._git.get_object(v)
 
47
            while isinstance(obj, Tag):
 
48
                v = obj.object[1]
 
49
                obj = self.repository._git.get_object(v)
 
50
            if not isinstance(obj, Commit):
 
51
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
52
                continue
 
53
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
54
        return ret
 
55
 
 
56
    def set_tag(self, name, revid):
 
57
        self.repository._git.tags[name] = revid
27
58
 
28
59
 
29
60
class GitBranchConfig(config.BranchConfig):
34
65
        # do not provide a BranchDataConfig
35
66
        self.option_sources = self.option_sources[0], self.option_sources[2]
36
67
 
37
 
    def set_user_option(self, name, value, local=False):
 
68
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
38
69
        """Force local to True"""
39
 
        config.BranchConfig.set_user_option(self, name, value, local=True)
 
70
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
40
71
 
41
72
 
42
73
class GitBranchFormat(branch.BranchFormat):
43
74
 
44
 
    def get_branch_description(self):
 
75
    def get_format_description(self):
45
76
        return 'Git Branch'
46
77
 
47
 
 
48
 
class GitBranch(branch.Branch):
 
78
    def supports_tags(self):
 
79
        return True
 
80
 
 
81
 
 
82
class GitBranch(ForeignBranch):
49
83
    """An adapter to git repositories for bzr Branch objects."""
50
84
 
51
 
    def __init__(self, gitdir, lockfiles):
52
 
        super(GitBranch, self).__init__()
53
 
        from bzrlib.plugins.git import git_repository
54
 
        self.bzrdir = gitdir
 
85
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
86
        self.repository = repository
 
87
        super(GitBranch, self).__init__(repository.get_mapping())
55
88
        self.control_files = lockfiles
56
 
        self.repository = git_repository.GitRepository(gitdir, lockfiles)
57
 
        self.base = gitdir.root_transport.base
58
 
        if '.git' not in gitdir.root_transport.list_dir('.'):
59
 
            raise errors.NotBranchError(self.base)
 
89
        self.bzrdir = bzrdir
 
90
        self.name = name
 
91
        self.head = head
 
92
        self.base = bzrdir.transport.base
60
93
        self._format = GitBranchFormat()
61
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
 
102
 
62
103
    def lock_write(self):
63
104
        self.control_files.lock_write()
64
105
 
 
106
    def get_stacked_on_url(self):
 
107
        # Git doesn't do stacking (yet...)
 
108
        return None
 
109
 
 
110
    def get_parent(self):
 
111
        """See Branch.get_parent()."""
 
112
        return None
 
113
 
 
114
    def set_parent(self, url):
 
115
        pass
 
116
 
 
117
    def lock_read(self):
 
118
        self.control_files.lock_read()
 
119
 
 
120
    def unlock(self):
 
121
        self.control_files.unlock()
 
122
 
 
123
    def get_physical_lock_status(self):
 
124
        return False
 
125
 
 
126
 
 
127
class LocalGitBranch(GitBranch):
 
128
 
65
129
    @needs_read_lock
66
130
    def last_revision(self):
67
131
        # perhaps should escape this ?
68
 
        head_git_id = self.repository._git.get_head()
69
 
        if head_git_id is None:
 
132
        if self.head is None:
70
133
            return revision.NULL_REVISION
71
 
        return ids.convert_revision_id_git_to_bzr(head_git_id)
72
 
 
73
 
    @needs_read_lock
74
 
    def revision_history(self):
75
 
        node = self.last_revision()
76
 
        if node == 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):
 
138
        if lightweight:
 
139
            raise LightWeightCheckoutsNotSupported()
 
140
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
141
 
 
142
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
 
143
                                     hardlink=False):
 
144
        """Create a new heavyweight checkout of this branch.
 
145
 
 
146
        :param to_location: URL of location to create the new checkout in.
 
147
        :param revision_id: Revision that should be the tip of the checkout.
 
148
        :param hardlink: Whether to hardlink
 
149
        :return: WorkingTree object of checkout.
 
150
        """
 
151
        checkout_branch = BzrDir.create_branch_convenience(
 
152
            to_location, force_new_tree=False, format=get_rich_root_format())
 
153
        checkout = checkout_branch.bzrdir
 
154
        checkout_branch.bind(self)
 
155
        # pull up to the specified revision_id to set the initial 
 
156
        # branch tip correctly, and seed it with history.
 
157
        checkout_branch.pull(self, stop_revision=revision_id)
 
158
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
 
159
 
 
160
    def _make_tags(self):
 
161
        return GitTagDict(self)
 
162
 
 
163
    def _gen_revision_history(self):
 
164
        if self.head is None:
77
165
            return []
78
 
        ancestors = self.repository.get_revision_graph(node)
79
 
        history = []
80
 
        while node is not None:
81
 
            history.append(node)
82
 
            if len(ancestors[node]) > 0:
83
 
                node = ancestors[node][0]
84
 
            else:
85
 
                node = None
86
 
        return list(reversed(history))
 
166
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
167
        ret.reverse()
 
168
        return ret
87
169
 
88
170
    def get_config(self):
89
171
        return GitBranchConfig(self)
90
172
 
91
 
    def lock_read(self):
92
 
        self.control_files.lock_read()
93
 
 
94
 
    def unlock(self):
95
 
        self.control_files.unlock()
96
 
 
97
173
    def get_push_location(self):
98
174
        """See Branch.get_push_location."""
99
175
        push_loc = self.get_config().get_user_option('push_location')
102
178
    def set_push_location(self, location):
103
179
        """See Branch.set_push_location."""
104
180
        self.get_config().set_user_option('push_location', location,
105
 
                                          local=True)
 
181
                                          store=config.STORE_LOCATION)
106
182
 
107
183
    def supports_tags(self):
108
 
        return False
 
184
        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
 
206
        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)
 
212
            if self.target.repository.has_revision(self._last_revid):
 
213
                return []
 
214
            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)