/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
1
# Copyright (C) 2007 Canonical Ltd
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
2
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
18
"""An adapter between a Git Branch and a Bazaar Branch"""
19
20
from bzrlib import (
21
    branch,
22
    config,
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
23
    repository,
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
24
    revision,
0.200.82 by Jelmer Vernooij
Support listing tags.
25
    tag,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
26
    )
27
from bzrlib.decorators import needs_read_lock
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
28
from bzrlib.trace import mutter
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
29
0.200.111 by Jelmer Vernooij
Merge bzr-foreign.
30
from bzrlib.plugins.git.foreign import ForeignBranch
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
31
from bzrlib.plugins.git.errors import LightWeightCheckoutsNotSupported
0.200.20 by John Arbash Meinel
All tests are passing again
32
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
33
from dulwich.objects import (
34
        Commit,
35
        Tag,
36
        )
37
0.200.82 by Jelmer Vernooij
Support listing tags.
38
class GitTagDict(tag.BasicTags):
39
0.200.89 by Jelmer Vernooij
Support sprouting branches.
40
    def __init__(self, branch):
41
        self.branch = branch
42
        self.repository = branch.repository
0.200.82 by Jelmer Vernooij
Support listing tags.
43
44
    def get_tag_dict(self):
45
        ret = {}
0.200.180 by Jelmer Vernooij
Simplify tag handling.
46
        for k,v in self.repository._git.tags.iteritems():
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
47
            obj = self.repository._git.get_object(v)
48
            while isinstance(obj, Tag):
49
                v = obj.object[1]
50
                obj = self.repository._git.get_object(v)
51
            if not isinstance(obj, Commit):
52
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
53
                continue
0.200.180 by Jelmer Vernooij
Simplify tag handling.
54
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
0.200.82 by Jelmer Vernooij
Support listing tags.
55
        return ret
56
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
57
    def set_tag(self, name, revid):
0.200.181 by Jelmer Vernooij
Support setting tags.
58
        self.repository._git.tags[name] = revid
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
59
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
60
61
class GitBranchConfig(config.BranchConfig):
62
    """BranchConfig that uses locations.conf in place of branch.conf"""
63
64
    def __init__(self, branch):
65
        config.BranchConfig.__init__(self, branch)
66
        # do not provide a BranchDataConfig
67
        self.option_sources = self.option_sources[0], self.option_sources[2]
68
0.217.54 by John Carr
set_user_option breaks - doesnt have a local option in BranchConfig. Follow the bzr.dev syntax instead.
69
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
70
        """Force local to True"""
0.217.54 by John Carr
set_user_option breaks - doesnt have a local option in BranchConfig. Follow the bzr.dev syntax instead.
71
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
72
73
74
class GitBranchFormat(branch.BranchFormat):
75
0.200.70 by Jelmer Vernooij
Implement GitBranchFormat.get_format_description.
76
    def get_format_description(self):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
77
        return 'Git Branch'
78
0.200.82 by Jelmer Vernooij
Support listing tags.
79
    def supports_tags(self):
80
        return True
81
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
82
    def make_tags(self, branch):
83
        return GitTagDict(branch)
84
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
85
0.200.111 by Jelmer Vernooij
Merge bzr-foreign.
86
class GitBranch(ForeignBranch):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
87
    """An adapter to git repositories for bzr Branch objects."""
88
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
89
    def __init__(self, bzrdir, repository, name, head, lockfiles):
0.200.82 by Jelmer Vernooij
Support listing tags.
90
        self.repository = repository
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
91
        self._format = GitBranchFormat()
0.222.1 by Jelmer Vernooij
Retrieve mapping from repository rather than just using the default mapping.
92
        super(GitBranch, self).__init__(repository.get_mapping())
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
93
        self.control_files = lockfiles
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
94
        self.bzrdir = bzrdir
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
95
        self.name = name
0.200.57 by Jelmer Vernooij
Fix more tests.
96
        self.head = head
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
97
        self.base = bzrdir.transport.base
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
98
0.200.211 by Jelmer Vernooij
Add basic infrastructure for dpush.
99
    def dpull(self, source, stop_revision=None):
100
        if stop_revision is None:
101
            stop_revision = source.last_revision()
102
        # FIXME: Check for diverged branches
103
        revidmap = self.repository.dfetch(source.repository, stop_revision)
104
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(revidmap[stop_revision])
105
        return revidmap
106
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
107
    def lock_write(self):
108
        self.control_files.lock_write()
109
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
110
    def get_stacked_on_url(self):
111
        # Git doesn't do stacking (yet...)
112
        return None
113
114
    def get_parent(self):
115
        """See Branch.get_parent()."""
116
        return None
117
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
118
    def set_parent(self, url):
119
        pass
120
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
121
    def lock_read(self):
122
        self.control_files.lock_read()
123
124
    def unlock(self):
125
        self.control_files.unlock()
126
127
    def get_physical_lock_status(self):
128
        return False
129
130
 
131
class LocalGitBranch(GitBranch):
132
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
133
    @needs_read_lock
134
    def last_revision(self):
135
        # perhaps should escape this ?
0.200.57 by Jelmer Vernooij
Fix more tests.
136
        if self.head is None:
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
137
            return revision.NULL_REVISION
0.200.112 by Jelmer Vernooij
Fix the build.
138
        return self.mapping.revision_id_foreign_to_bzr(self.head)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
139
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
140
    def create_checkout(self, to_location, revision_id=None, 
141
                        lightweight=False, accelerator_tree=None, hardlink=False):
142
        if lightweight:
143
            raise LightWeightCheckoutsNotSupported()
144
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
145
146
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
147
                                     hardlink=False):
148
        """Create a new heavyweight checkout of this branch.
149
150
        :param to_location: URL of location to create the new checkout in.
151
        :param revision_id: Revision that should be the tip of the checkout.
152
        :param hardlink: Whether to hardlink
153
        :return: WorkingTree object of checkout.
154
        """
155
        checkout_branch = BzrDir.create_branch_convenience(
156
            to_location, force_new_tree=False, format=get_rich_root_format())
157
        checkout = checkout_branch.bzrdir
158
        checkout_branch.bind(self)
159
        # pull up to the specified revision_id to set the initial 
160
        # branch tip correctly, and seed it with history.
161
        checkout_branch.pull(self, stop_revision=revision_id)
162
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
163
0.200.57 by Jelmer Vernooij
Fix more tests.
164
    def _gen_revision_history(self):
0.200.58 by Jelmer Vernooij
Fix remaining tests.
165
        if self.head is None:
166
            return []
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
167
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
168
        ret.reverse()
0.200.57 by Jelmer Vernooij
Fix more tests.
169
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
170
171
    def get_config(self):
172
        return GitBranchConfig(self)
173
174
    def get_push_location(self):
175
        """See Branch.get_push_location."""
176
        push_loc = self.get_config().get_user_option('push_location')
177
        return push_loc
178
179
    def set_push_location(self, location):
180
        """See Branch.set_push_location."""
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
181
        self.get_config().set_user_option('push_location', location,
0.217.54 by John Carr
set_user_option breaks - doesnt have a local option in BranchConfig. Follow the bzr.dev syntax instead.
182
                                          store=config.STORE_LOCATION)
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
183
184
    def supports_tags(self):
0.200.82 by Jelmer Vernooij
Support listing tags.
185
        return True
0.200.96 by Jelmer Vernooij
Fix branch.
186
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
187
188
class InterGitGenericBranch(branch.InterBranch):
189
190
    @classmethod
191
    def is_compatible(self, source, target):
192
        return isinstance(source, GitBranch)
193
194
    def update_revisions(self, stop_revision=None, overwrite=False,
195
        graph=None):
196
        """See InterBranch.update_revisions()."""
197
        # TODO: stop_revision, overwrite
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
198
        interrepo = repository.InterRepository.get(self.source.repository, 
199
            self.target.repository)
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
200
        self._last_revid = None
201
        def determine_wants(heads):
202
            if not self.source.name in heads:
203
                raise BzrError("No such remote branch '%s', found: %r" % (
204
                    self.source.name, heads.keys()))
205
            head = heads[self.source.name]
206
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
0.200.226 by Jelmer Vernooij
Merge thin-pack work.
207
            if self.target.repository.has_revision(self._last_revid):
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
208
                return []
209
            return [head]
210
        interrepo.fetch_objects(determine_wants, self.source.mapping)
0.225.2 by Jelmer Vernooij
Handle situation when repository is already up to date during pull.
211
        self.target.generate_revision_history(self._last_revid)
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
212
213
214
branch.InterBranch.register_optimiser(InterGitGenericBranch)