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