/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 tests.

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
    is_quiet,
 
39
    mutter,
 
40
    )
 
41
 
 
42
from bzrlib.plugins.git.errors import (
 
43
    NoSuchRef,
 
44
    )
 
45
 
 
46
 
 
47
class GitPullResult(branch.PullResult):
 
48
 
 
49
    def _lookup_revno(self, revid):
 
50
        assert isinstance(revid, str), "was %r" % revid
 
51
        # Try in source branch first, it'll be faster
 
52
        return self.target_branch.revision_id_to_revno(revid)
 
53
 
 
54
    @property
 
55
    def old_revno(self):
 
56
        return self._lookup_revno(self.old_revid)
 
57
 
 
58
    @property
 
59
    def new_revno(self):
 
60
        return self._lookup_revno(self.new_revid)
 
61
 
 
62
 
 
63
class LocalGitTagDict(tag.BasicTags):
 
64
    """Dictionary with tags in a local repository."""
38
65
 
39
66
    def __init__(self, branch):
40
67
        self.branch = branch
48
75
                v = obj.object[1]
49
76
                obj = self.repository._git.get_object(v)
50
77
            if not isinstance(obj, Commit):
51
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
78
                mutter("Tag %s points at object %r that is not a commit, "
 
79
                       "ignoring", k, obj)
52
80
                continue
53
81
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
54
82
        return ret
65
93
        # do not provide a BranchDataConfig
66
94
        self.option_sources = self.option_sources[0], self.option_sources[2]
67
95
 
68
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
 
96
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
 
97
            warn_masked=False):
69
98
        """Force local to True"""
70
 
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
 
99
        config.BranchConfig.set_user_option(self, name, value,
 
100
            store=config.STORE_LOCATION, warn_masked=warn_masked)
71
101
 
72
102
 
73
103
class GitBranchFormat(branch.BranchFormat):
78
108
    def supports_tags(self):
79
109
        return True
80
110
 
81
 
 
82
 
class GitBranch(ForeignBranch):
 
111
    def make_tags(self, branch):
 
112
        if getattr(branch.repository, "get_refs", None) is not None:
 
113
            from bzrlib.plugins.git.remote import RemoteGitTagDict
 
114
            return RemoteGitTagDict(branch)
 
115
        else:
 
116
            return LocalGitTagDict(branch)
 
117
 
 
118
 
 
119
class GitBranch(foreign.ForeignBranch):
83
120
    """An adapter to git repositories for bzr Branch objects."""
84
121
 
85
122
    def __init__(self, bzrdir, repository, name, head, lockfiles):
86
123
        self.repository = repository
87
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
124
        self._format = GitBranchFormat()
88
125
        self.control_files = lockfiles
89
126
        self.bzrdir = bzrdir
 
127
        super(GitBranch, self).__init__(repository.get_mapping())
90
128
        self.name = name
91
129
        self.head = head
92
130
        self.base = bzrdir.transport.base
93
 
        self._format = GitBranchFormat()
 
131
 
 
132
    def _get_nick(self, local=False, possible_master_transports=None):
 
133
        """Find the nick name for this branch.
 
134
 
 
135
        :return: Branch nick
 
136
        """
 
137
        return self.name
 
138
 
 
139
    def _set_nick(self, nick):
 
140
        raise NotImplementedError
 
141
 
 
142
    nick = property(_get_nick, _set_nick)
94
143
 
95
144
    def dpull(self, source, stop_revision=None):
96
145
        if stop_revision is None:
97
146
            stop_revision = source.last_revision()
98
147
        # FIXME: Check for diverged branches
99
148
        revidmap = self.repository.dfetch(source.repository, stop_revision)
100
 
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(revidmap[stop_revision])
 
149
        if revidmap != {}:
 
150
            self.generate_revision_history(revidmap[stop_revision])
101
151
        return revidmap
102
152
 
 
153
    def generate_revision_history(self, revid, old_revid=None):
 
154
        # FIXME: Check that old_revid is in the ancestry of revid
 
155
        newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
 
156
        self._set_head(newhead)
 
157
 
 
158
    def _set_head(self, head):
 
159
        self.head = head
 
160
        self.repository._git.set_ref(self.name, self.head)
 
161
 
103
162
    def lock_write(self):
104
163
        self.control_files.lock_write()
105
164
 
109
168
 
110
169
    def get_parent(self):
111
170
        """See Branch.get_parent()."""
 
171
        # FIXME: Set "origin" url from .git/config ?
112
172
        return None
113
173
 
114
174
    def set_parent(self, url):
 
175
        # FIXME: Set "origin" url in .git/config ?
115
176
        pass
116
177
 
117
178
    def lock_read(self):
125
186
 
126
187
 
127
188
class LocalGitBranch(GitBranch):
 
189
    """A local Git branch."""
128
190
 
129
191
    @needs_read_lock
130
192
    def last_revision(self):
133
195
            return revision.NULL_REVISION
134
196
        return self.mapping.revision_id_foreign_to_bzr(self.head)
135
197
 
136
 
    def create_checkout(self, to_location, revision_id=None, 
137
 
                        lightweight=False, accelerator_tree=None, hardlink=False):
 
198
    def _get_checkout_format(self):
 
199
        """Return the most suitable metadir for a checkout of this branch.
 
200
        Weaves are used if this branch's repository uses weaves.
 
201
        """
 
202
        format = self.repository.bzrdir.checkout_metadir()
 
203
        format.set_branch_format(self._format)
 
204
        return format
 
205
 
 
206
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
 
207
        accelerator_tree=None, hardlink=False):
138
208
        if lightweight:
139
 
            raise LightWeightCheckoutsNotSupported()
140
 
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
209
            t = transport.get_transport(to_location)
 
210
            t.ensure_base()
 
211
            format = self._get_checkout_format()
 
212
            checkout = format.initialize_on_transport(t)
 
213
            from_branch = branch.BranchReferenceFormat().initialize(checkout, 
 
214
                self)
 
215
            tree = checkout.create_workingtree(revision_id,
 
216
                from_branch=from_branch, hardlink=hardlink)
 
217
            return tree
 
218
        else:
 
219
            return self._create_heavyweight_checkout(to_location, revision_id,
 
220
            hardlink)
141
221
 
142
222
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
143
223
                                     hardlink=False):
157
237
        checkout_branch.pull(self, stop_revision=revision_id)
158
238
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
159
239
 
160
 
    def _make_tags(self):
161
 
        return GitTagDict(self)
162
 
 
163
240
    def _gen_revision_history(self):
164
241
        if self.head is None:
165
242
            return []
166
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
243
        ret = list(self.repository.iter_reverse_revision_history(
 
244
            self.last_revision()))
167
245
        ret.reverse()
168
246
        return ret
169
247
 
183
261
    def supports_tags(self):
184
262
        return True
185
263
 
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
 
264
 
 
265
class GitBranchPullResult(branch.PullResult):
 
266
 
 
267
    def report(self, to_file):
 
268
        if not is_quiet():
 
269
            if self.old_revid == self.new_revid:
 
270
                to_file.write('No revisions to pull.\n')
 
271
            else:
 
272
                to_file.write('Now on revision %d (git sha: %s).\n' % 
 
273
                        (self.new_revno, self.new_git_head))
 
274
        self._show_tag_conficts(to_file)
192
275
 
193
276
 
194
277
class InterGitGenericBranch(branch.InterBranch):
 
278
    """InterBranch implementation that pulls from Git into bzr."""
195
279
 
196
280
    @classmethod
197
281
    def is_compatible(self, source, target):
198
 
        return isinstance(source, GitBranch)
 
282
        return (isinstance(source, GitBranch) and 
 
283
                not isinstance(target, GitBranch))
199
284
 
200
285
    def update_revisions(self, stop_revision=None, overwrite=False,
201
286
        graph=None):
202
287
        """See InterBranch.update_revisions()."""
203
 
        # TODO: stop_revision, overwrite
204
 
        interrepo = repository.InterRepository.get(self.source.repository, self.target.repository)
 
288
        interrepo = repository.InterRepository.get(self.source.repository, 
 
289
            self.target.repository)
 
290
        self._head = None
205
291
        self._last_revid = None
206
292
        def determine_wants(heads):
207
293
            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)
 
294
                raise NoSuchRef(self.source.name, heads.keys())
 
295
            if stop_revision is not None:
 
296
                self._last_revid = stop_revision
 
297
                self._head, mapping = self.source.repository.lookup_git_revid(
 
298
                    stop_revision)
 
299
            else:
 
300
                self._head = heads[self.source.name]
 
301
                self._last_revid = \
 
302
                    self.source.mapping.revision_id_foreign_to_bzr(self._head)
212
303
            if self.target.repository.has_revision(self._last_revid):
213
304
                return []
214
 
            return [head]
 
305
            return [self._head]
215
306
        interrepo.fetch_objects(determine_wants, self.source.mapping)
216
 
        self.target.generate_revision_history(self._last_revid)
 
307
        if overwrite:
 
308
            prev_last_revid = None
 
309
        else:
 
310
            prev_last_revid = self.target.last_revision()
 
311
        self.target.generate_revision_history(self._last_revid, prev_last_revid)
 
312
 
 
313
    def pull(self, overwrite=False, stop_revision=None,
 
314
             possible_transports=None, _hook_master=None, run_hooks=True,
 
315
             _override_hook_target=None):
 
316
        """See Branch.pull.
 
317
 
 
318
        :param _hook_master: Private parameter - set the branch to
 
319
            be supplied as the master to pull hooks.
 
320
        :param run_hooks: Private parameter - if false, this branch
 
321
            is being called because it's the master of the primary branch,
 
322
            so it should not run its hooks.
 
323
        :param _override_hook_target: Private parameter - set the branch to be
 
324
            supplied as the target_branch to pull hooks.
 
325
        """
 
326
        result = GitBranchPullResult()
 
327
        result.source_branch = self.source
 
328
        if _override_hook_target is None:
 
329
            result.target_branch = self.target
 
330
        else:
 
331
            result.target_branch = _override_hook_target
 
332
        self.source.lock_read()
 
333
        try:
 
334
            # We assume that during 'pull' the target repository is closer than
 
335
            # the source one.
 
336
            graph = self.target.repository.get_graph(self.source.repository)
 
337
            result.old_revno, result.old_revid = \
 
338
                self.target.last_revision_info()
 
339
            self.update_revisions(stop_revision, overwrite=overwrite, 
 
340
                graph=graph)
 
341
            result.new_git_head = self._head
 
342
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
 
343
                overwrite)
 
344
            result.new_revno, result.new_revid = self.target.last_revision_info()
 
345
            if _hook_master:
 
346
                result.master_branch = _hook_master
 
347
                result.local_branch = result.target_branch
 
348
            else:
 
349
                result.master_branch = result.target_branch
 
350
                result.local_branch = None
 
351
            if run_hooks:
 
352
                for hook in branch.Branch.hooks['post_pull']:
 
353
                    hook(result)
 
354
        finally:
 
355
            self.source.unlock()
 
356
        return result
 
357
 
 
358
 
217
359
 
218
360
 
219
361
branch.InterBranch.register_optimiser(InterGitGenericBranch)
 
362
 
 
363
 
 
364
class InterGitRemoteLocalBranch(branch.InterBranch):
 
365
    """InterBranch implementation that pulls between Git branches."""
 
366
 
 
367
    @classmethod
 
368
    def is_compatible(self, source, target):
 
369
        from bzrlib.plugins.git.remote import RemoteGitBranch
 
370
        return (isinstance(source, RemoteGitBranch) and 
 
371
                isinstance(target, LocalGitBranch))
 
372
 
 
373
    def pull(self, stop_revision=None, overwrite=False, 
 
374
        possible_transports=None):
 
375
        result = GitPullResult()
 
376
        result.source_branch = self.source
 
377
        result.target_branch = self.target
 
378
        interrepo = repository.InterRepository.get(self.source.repository, 
 
379
            self.target.repository)
 
380
        result.old_revid = self.target.last_revision()
 
381
        if stop_revision is None:
 
382
            stop_revision = self.source.last_revision()
 
383
        interrepo.fetch(revision_id=stop_revision)
 
384
        self.target.generate_revision_history(stop_revision, result.old_revid)
 
385
        result.new_revid = self.target.last_revision()
 
386
        return result
 
387
 
 
388
 
 
389
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)