/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

Remove silly mapping of timezones; dulwich uses offsets now as well.

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