/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 basic infrastructure for dpush.

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