/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

Somewhat fix commit in git working trees.

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
    errors,
 
29
    foreign,
 
30
    repository,
22
31
    revision,
23
32
    tag,
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):
 
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."""
37
77
 
38
78
    def __init__(self, branch):
39
79
        self.branch = branch
47
87
                v = obj.object[1]
48
88
                obj = self.repository._git.get_object(v)
49
89
            if not isinstance(obj, Commit):
50
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
90
                mutter("Tag %s points at object %r that is not a commit, "
 
91
                       "ignoring", k, obj)
51
92
                continue
52
93
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
53
94
        return ret
56
97
        self.repository._git.tags[name] = revid
57
98
 
58
99
 
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
 
 
72
100
class GitBranchFormat(branch.BranchFormat):
73
101
 
74
102
    def get_format_description(self):
77
105
    def supports_tags(self):
78
106
        return True
79
107
 
 
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
 
80
115
 
81
116
class GitBranch(ForeignBranch):
82
117
    """An adapter to git repositories for bzr Branch objects."""
83
118
 
84
119
    def __init__(self, bzrdir, repository, name, head, lockfiles):
85
120
        self.repository = repository
86
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
121
        self._format = GitBranchFormat()
87
122
        self.control_files = lockfiles
88
123
        self.bzrdir = bzrdir
 
124
        super(GitBranch, self).__init__(repository.get_mapping())
89
125
        self.name = name
90
126
        self.head = head
91
127
        self.base = bzrdir.transport.base
92
 
        self._format = GitBranchFormat()
 
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)
93
143
 
94
144
    def dpull(self, source, stop_revision=None):
95
145
        if stop_revision is None:
96
146
            stop_revision = source.last_revision()
97
147
        # FIXME: Check for diverged branches
98
 
        revidmap = self.repository.dfetch(source.repository, stop_revision)
99
 
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(revidmap[stop_revision])
 
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])
100
156
        return revidmap
101
157
 
 
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
        self._clear_cached_state()
 
167
 
102
168
    def lock_write(self):
103
169
        self.control_files.lock_write()
104
170
 
108
174
 
109
175
    def get_parent(self):
110
176
        """See Branch.get_parent()."""
 
177
        # FIXME: Set "origin" url from .git/config ?
111
178
        return None
112
179
 
113
180
    def set_parent(self, url):
 
181
        # FIXME: Set "origin" url in .git/config ?
114
182
        pass
115
183
 
116
184
    def lock_read(self):
117
185
        self.control_files.lock_read()
118
186
 
 
187
    def is_locked(self):
 
188
        return self.control_files.is_locked()
 
189
 
119
190
    def unlock(self):
120
191
        self.control_files.unlock()
121
192
 
124
195
 
125
196
 
126
197
class LocalGitBranch(GitBranch):
 
198
    """A local Git branch."""
127
199
 
128
200
    @needs_read_lock
129
201
    def last_revision(self):
132
204
            return revision.NULL_REVISION
133
205
        return self.mapping.revision_id_foreign_to_bzr(self.head)
134
206
 
135
 
    def create_checkout(self, to_location, revision_id=None, 
136
 
                        lightweight=False, accelerator_tree=None, hardlink=False):
 
207
    def _get_checkout_format(self):
 
208
        """Return the most suitable metadir for a checkout of this branch.
 
209
        Weaves are used if this branch's repository uses weaves.
 
210
        """
 
211
        format = self.repository.bzrdir.checkout_metadir()
 
212
        format.set_branch_format(self._format)
 
213
        return format
 
214
 
 
215
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
 
216
        accelerator_tree=None, hardlink=False):
137
217
        if lightweight:
138
 
            raise LightWeightCheckoutsNotSupported()
139
 
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
218
            t = transport.get_transport(to_location)
 
219
            t.ensure_base()
 
220
            format = self._get_checkout_format()
 
221
            checkout = format.initialize_on_transport(t)
 
222
            from_branch = branch.BranchReferenceFormat().initialize(checkout, 
 
223
                self)
 
224
            tree = checkout.create_workingtree(revision_id,
 
225
                from_branch=from_branch, hardlink=hardlink)
 
226
            return tree
 
227
        else:
 
228
            return self._create_heavyweight_checkout(to_location, revision_id,
 
229
            hardlink)
140
230
 
141
231
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
142
232
                                     hardlink=False):
156
246
        checkout_branch.pull(self, stop_revision=revision_id)
157
247
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
158
248
 
159
 
    def _make_tags(self):
160
 
        return GitTagDict(self)
161
 
 
162
249
    def _gen_revision_history(self):
163
250
        if self.head is None:
164
251
            return []
165
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
252
        ret = list(self.repository.iter_reverse_revision_history(
 
253
            self.last_revision()))
166
254
        ret.reverse()
167
255
        return ret
168
256
 
182
270
    def supports_tags(self):
183
271
        return True
184
272
 
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
 
 
 
273
 
 
274
class GitBranchPullResult(branch.PullResult):
 
275
 
 
276
    def report(self, to_file):
 
277
        if not is_quiet():
 
278
            if self.old_revid == self.new_revid:
 
279
                to_file.write('No revisions to pull.\n')
 
280
            else:
 
281
                to_file.write('Now on revision %d (git sha: %s).\n' % 
 
282
                        (self.new_revno, self.new_git_head))
 
283
        self._show_tag_conficts(to_file)
 
284
 
 
285
 
 
286
class InterGitGenericBranch(branch.InterBranch):
 
287
    """InterBranch implementation that pulls from Git into bzr."""
 
288
 
 
289
    @classmethod
 
290
    def is_compatible(self, source, target):
 
291
        return (isinstance(source, GitBranch) and 
 
292
                not isinstance(target, GitBranch))
 
293
 
 
294
    def update_revisions(self, stop_revision=None, overwrite=False,
 
295
        graph=None):
 
296
        """See InterBranch.update_revisions()."""
 
297
        interrepo = repository.InterRepository.get(self.source.repository, 
 
298
            self.target.repository)
 
299
        self._head = None
 
300
        self._last_revid = None
 
301
        def determine_wants(heads):
 
302
            if not self.source.name in heads:
 
303
                raise NoSuchRef(self.source.name, heads.keys())
 
304
            if stop_revision is not None:
 
305
                self._last_revid = stop_revision
 
306
                self._head, mapping = self.source.repository.lookup_git_revid(
 
307
                    stop_revision)
 
308
            else:
 
309
                self._head = heads[self.source.name]
 
310
                self._last_revid = \
 
311
                    self.source.mapping.revision_id_foreign_to_bzr(self._head)
 
312
            if self.target.repository.has_revision(self._last_revid):
 
313
                return []
 
314
            return [self._head]
 
315
        interrepo.fetch_objects(determine_wants, self.source.mapping)
 
316
        if overwrite:
 
317
            prev_last_revid = None
 
318
        else:
 
319
            prev_last_revid = self.target.last_revision()
 
320
        self.target.generate_revision_history(self._last_revid, prev_last_revid)
 
321
 
 
322
    def pull(self, overwrite=False, stop_revision=None,
 
323
             possible_transports=None, _hook_master=None, run_hooks=True,
 
324
             _override_hook_target=None, local=False):
 
325
        """See Branch.pull.
 
326
 
 
327
        :param _hook_master: Private parameter - set the branch to
 
328
            be supplied as the master to pull hooks.
 
329
        :param run_hooks: Private parameter - if false, this branch
 
330
            is being called because it's the master of the primary branch,
 
331
            so it should not run its hooks.
 
332
        :param _override_hook_target: Private parameter - set the branch to be
 
333
            supplied as the target_branch to pull hooks.
 
334
        """
 
335
        # This type of branch can't be bound.
 
336
        if local:
 
337
            raise errors.LocalRequiresBoundBranch()
 
338
        result = GitBranchPullResult()
 
339
        result.source_branch = self.source
 
340
        if _override_hook_target is None:
 
341
            result.target_branch = self.target
 
342
        else:
 
343
            result.target_branch = _override_hook_target
 
344
        self.source.lock_read()
 
345
        try:
 
346
            # We assume that during 'pull' the target repository is closer than
 
347
            # the source one.
 
348
            graph = self.target.repository.get_graph(self.source.repository)
 
349
            result.old_revno, result.old_revid = \
 
350
                self.target.last_revision_info()
 
351
            self.update_revisions(stop_revision, overwrite=overwrite, 
 
352
                graph=graph)
 
353
            result.new_git_head = self._head
 
354
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
 
355
                overwrite)
 
356
            result.new_revno, result.new_revid = self.target.last_revision_info()
 
357
            if _hook_master:
 
358
                result.master_branch = _hook_master
 
359
                result.local_branch = result.target_branch
 
360
            else:
 
361
                result.master_branch = result.target_branch
 
362
                result.local_branch = None
 
363
            if run_hooks:
 
364
                for hook in branch.Branch.hooks['post_pull']:
 
365
                    hook(result)
 
366
        finally:
 
367
            self.source.unlock()
 
368
        return result
 
369
 
 
370
 
 
371
 
 
372
 
 
373
branch.InterBranch.register_optimiser(InterGitGenericBranch)
 
374
 
 
375
 
 
376
class InterGitRemoteLocalBranch(branch.InterBranch):
 
377
    """InterBranch implementation that pulls between Git branches."""
 
378
 
 
379
    @classmethod
 
380
    def is_compatible(self, source, target):
 
381
        from bzrlib.plugins.git.remote import RemoteGitBranch
 
382
        return (isinstance(source, RemoteGitBranch) and 
 
383
                isinstance(target, LocalGitBranch))
 
384
 
 
385
    def pull(self, stop_revision=None, overwrite=False, 
 
386
        possible_transports=None, local=False):
 
387
        # This type of branch can't be bound.
 
388
        if local:
 
389
            raise errors.LocalRequiresBoundBranch()
 
390
        result = GitPullResult()
 
391
        result.source_branch = self.source
 
392
        result.target_branch = self.target
 
393
        interrepo = repository.InterRepository.get(self.source.repository, 
 
394
            self.target.repository)
 
395
        result.old_revid = self.target.last_revision()
 
396
        if stop_revision is None:
 
397
            refs = interrepo.fetch_refs(branches=["HEAD"])
 
398
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
 
399
        else:
 
400
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
401
        self.target.generate_revision_history(stop_revision, result.old_revid)
 
402
        result.new_revid = self.target.last_revision()
 
403
        return result
 
404
 
 
405
 
 
406
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)