/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 branch cloning.

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
 
    foreign,
29
 
    repository,
30
22
    revision,
31
23
    tag,
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."""
 
24
    )
 
25
from bzrlib.decorators import needs_read_lock
 
26
 
 
27
from bzrlib.plugins.git.foreign import ForeignBranch
 
28
from bzrlib.plugins.git.mapping import default_mapping
 
29
 
 
30
class GitTagDict(tag.BasicTags):
65
31
 
66
32
    def __init__(self, branch):
67
33
        self.branch = branch
69
35
 
70
36
    def get_tag_dict(self):
71
37
        ret = {}
72
 
        for k,v in self.repository._git.tags.iteritems():
73
 
            obj = self.repository._git.get_object(v)
74
 
            while isinstance(obj, Tag):
75
 
                v = obj.object[1]
76
 
                obj = self.repository._git.get_object(v)
77
 
            if not isinstance(obj, Commit):
78
 
                mutter("Tag %s points at object %r that is not a commit, "
79
 
                       "ignoring", k, obj)
80
 
                continue
81
 
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
38
        for tag in self.repository._git.tags:
 
39
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
82
40
        return ret
83
41
 
84
42
    def set_tag(self, name, revid):
85
 
        self.repository._git.tags[name] = revid
 
43
        raise NotImplementedError(self.set_tag)
86
44
 
87
45
 
88
46
class GitBranchConfig(config.BranchConfig):
93
51
        # do not provide a BranchDataConfig
94
52
        self.option_sources = self.option_sources[0], self.option_sources[2]
95
53
 
96
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
97
 
            warn_masked=False):
 
54
    def set_user_option(self, name, value, local=False):
98
55
        """Force local to True"""
99
 
        config.BranchConfig.set_user_option(self, name, value,
100
 
            store=config.STORE_LOCATION, warn_masked=warn_masked)
 
56
        config.BranchConfig.set_user_option(self, name, value, local=True)
101
57
 
102
58
 
103
59
class GitBranchFormat(branch.BranchFormat):
108
64
    def supports_tags(self):
109
65
        return True
110
66
 
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):
 
67
 
 
68
class GitBranch(ForeignBranch):
120
69
    """An adapter to git repositories for bzr Branch objects."""
121
70
 
122
71
    def __init__(self, bzrdir, repository, name, head, lockfiles):
123
72
        self.repository = repository
124
 
        self._format = GitBranchFormat()
 
73
        super(GitBranch, self).__init__(default_mapping)
125
74
        self.control_files = lockfiles
126
75
        self.bzrdir = bzrdir
127
 
        super(GitBranch, self).__init__(repository.get_mapping())
128
76
        self.name = name
129
77
        self.head = head
130
78
        self.base = bzrdir.transport.base
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)
143
 
 
144
 
    def dpull(self, source, stop_revision=None):
145
 
        if stop_revision is None:
146
 
            stop_revision = source.last_revision()
147
 
        # FIXME: Check for diverged branches
148
 
        revidmap = self.repository.dfetch(source.repository, stop_revision)
149
 
        if revidmap != {}:
150
 
            self.generate_revision_history(revidmap[stop_revision])
151
 
        return revidmap
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)
 
79
        self._format = GitBranchFormat()
161
80
 
162
81
    def lock_write(self):
163
82
        self.control_files.lock_write()
168
87
 
169
88
    def get_parent(self):
170
89
        """See Branch.get_parent()."""
171
 
        # FIXME: Set "origin" url from .git/config ?
172
90
        return None
173
91
 
174
 
    def set_parent(self, url):
175
 
        # FIXME: Set "origin" url in .git/config ?
176
 
        pass
177
 
 
178
92
    def lock_read(self):
179
93
        self.control_files.lock_read()
180
94
 
186
100
 
187
101
 
188
102
class LocalGitBranch(GitBranch):
189
 
    """A local Git branch."""
190
103
 
191
104
    @needs_read_lock
192
105
    def last_revision(self):
195
108
            return revision.NULL_REVISION
196
109
        return self.mapping.revision_id_foreign_to_bzr(self.head)
197
110
 
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):
208
 
        if lightweight:
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)
221
 
 
222
 
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
223
 
                                     hardlink=False):
224
 
        """Create a new heavyweight checkout of this branch.
225
 
 
226
 
        :param to_location: URL of location to create the new checkout in.
227
 
        :param revision_id: Revision that should be the tip of the checkout.
228
 
        :param hardlink: Whether to hardlink
229
 
        :return: WorkingTree object of checkout.
230
 
        """
231
 
        checkout_branch = BzrDir.create_branch_convenience(
232
 
            to_location, force_new_tree=False, format=get_rich_root_format())
233
 
        checkout = checkout_branch.bzrdir
234
 
        checkout_branch.bind(self)
235
 
        # pull up to the specified revision_id to set the initial 
236
 
        # branch tip correctly, and seed it with history.
237
 
        checkout_branch.pull(self, stop_revision=revision_id)
238
 
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
 
111
    def _make_tags(self):
 
112
        return GitTagDict(self)
239
113
 
240
114
    def _gen_revision_history(self):
241
115
        if self.head is None:
242
116
            return []
243
 
        ret = list(self.repository.iter_reverse_revision_history(
244
 
            self.last_revision()))
 
117
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
245
118
        ret.reverse()
246
119
        return ret
247
120
 
256
129
    def set_push_location(self, location):
257
130
        """See Branch.set_push_location."""
258
131
        self.get_config().set_user_option('push_location', location,
259
 
                                          store=config.STORE_LOCATION)
 
132
                                          local=True)
260
133
 
261
134
    def supports_tags(self):
262
135
        return True
263
136
 
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)
275
 
 
276
 
 
277
 
class InterGitGenericBranch(branch.InterBranch):
278
 
    """InterBranch implementation that pulls from Git into bzr."""
279
 
 
280
 
    @classmethod
281
 
    def is_compatible(self, source, target):
282
 
        return (isinstance(source, GitBranch) and 
283
 
                not isinstance(target, GitBranch))
284
 
 
285
 
    def update_revisions(self, stop_revision=None, overwrite=False,
286
 
        graph=None):
287
 
        """See InterBranch.update_revisions()."""
288
 
        interrepo = repository.InterRepository.get(self.source.repository, 
289
 
            self.target.repository)
290
 
        self._head = None
291
 
        self._last_revid = None
292
 
        def determine_wants(heads):
293
 
            if not self.source.name in heads:
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)
303
 
            if self.target.repository.has_revision(self._last_revid):
304
 
                return []
305
 
            return [self._head]
306
 
        interrepo.fetch_objects(determine_wants, self.source.mapping)
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
 
 
359
 
 
360
 
 
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)
 
137
    def sprout(self, to_bzrdir, revision_id=None):
 
138
        """See Branch.sprout()."""
 
139
        result = to_bzrdir.create_branch()
 
140
        self.copy_content_into(result, revision_id=revision_id)
 
141
        result.set_parent(self.bzrdir.root_transport.base)
 
142
        return result
 
143