/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.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
22
    revision,
0.200.82 by Jelmer Vernooij
Support listing tags.
23
    tag,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
24
    )
25
from bzrlib.decorators import needs_read_lock
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
26
from bzrlib.trace import mutter
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
27
0.200.111 by Jelmer Vernooij
Merge bzr-foreign.
28
from bzrlib.plugins.git.foreign import ForeignBranch
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
29
from bzrlib.plugins.git.errors import LightWeightCheckoutsNotSupported
0.200.20 by John Arbash Meinel
All tests are passing again
30
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
31
from dulwich.objects import (
32
        Commit,
33
        Tag,
34
        )
35
0.200.82 by Jelmer Vernooij
Support listing tags.
36
class GitTagDict(tag.BasicTags):
37
0.200.89 by Jelmer Vernooij
Support sprouting branches.
38
    def __init__(self, branch):
39
        self.branch = branch
40
        self.repository = branch.repository
0.200.82 by Jelmer Vernooij
Support listing tags.
41
42
    def get_tag_dict(self):
43
        ret = {}
0.200.180 by Jelmer Vernooij
Simplify tag handling.
44
        for k,v in self.repository._git.tags.iteritems():
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
45
            obj = self.repository._git.get_object(v)
46
            while isinstance(obj, Tag):
47
                v = obj.object[1]
48
                obj = self.repository._git.get_object(v)
49
            if not isinstance(obj, Commit):
50
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
51
                continue
0.200.180 by Jelmer Vernooij
Simplify tag handling.
52
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
0.200.82 by Jelmer Vernooij
Support listing tags.
53
        return ret
54
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
55
    def set_tag(self, name, revid):
0.200.181 by Jelmer Vernooij
Support setting tags.
56
        self.repository._git.tags[name] = revid
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
57
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
58
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
0.217.54 by John Carr
set_user_option breaks - doesnt have a local option in BranchConfig. Follow the bzr.dev syntax instead.
67
    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.
68
        """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.
69
        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.
70
71
72
class GitBranchFormat(branch.BranchFormat):
73
0.200.70 by Jelmer Vernooij
Implement GitBranchFormat.get_format_description.
74
    def get_format_description(self):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
75
        return 'Git Branch'
76
0.200.82 by Jelmer Vernooij
Support listing tags.
77
    def supports_tags(self):
78
        return True
79
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
80
0.200.111 by Jelmer Vernooij
Merge bzr-foreign.
81
class GitBranch(ForeignBranch):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
82
    """An adapter to git repositories for bzr Branch objects."""
83
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
84
    def __init__(self, bzrdir, repository, name, head, lockfiles):
0.200.82 by Jelmer Vernooij
Support listing tags.
85
        self.repository = repository
0.222.1 by Jelmer Vernooij
Retrieve mapping from repository rather than just using the default mapping.
86
        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.
87
        self.control_files = lockfiles
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
88
        self.bzrdir = bzrdir
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
89
        self.name = name
0.200.57 by Jelmer Vernooij
Fix more tests.
90
        self.head = head
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
91
        self.base = bzrdir.transport.base
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
92
        self._format = GitBranchFormat()
93
0.200.211 by Jelmer Vernooij
Add basic infrastructure for dpush.
94
    def dpull(self, source, stop_revision=None):
95
        if stop_revision is None:
96
            stop_revision = source.last_revision()
97
        # 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])
100
        return revidmap
101
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
102
    def lock_write(self):
103
        self.control_files.lock_write()
104
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
105
    def get_stacked_on_url(self):
106
        # Git doesn't do stacking (yet...)
107
        return None
108
109
    def get_parent(self):
110
        """See Branch.get_parent()."""
111
        return None
112
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
113
    def set_parent(self, url):
114
        pass
115
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
116
    def lock_read(self):
117
        self.control_files.lock_read()
118
119
    def unlock(self):
120
        self.control_files.unlock()
121
122
    def get_physical_lock_status(self):
123
        return False
124
125
 
126
class LocalGitBranch(GitBranch):
127
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
128
    @needs_read_lock
129
    def last_revision(self):
130
        # perhaps should escape this ?
0.200.57 by Jelmer Vernooij
Fix more tests.
131
        if self.head is None:
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
132
            return revision.NULL_REVISION
0.200.112 by Jelmer Vernooij
Fix the build.
133
        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.
134
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
135
    def create_checkout(self, to_location, revision_id=None, 
136
                        lightweight=False, accelerator_tree=None, hardlink=False):
137
        if lightweight:
138
            raise LightWeightCheckoutsNotSupported()
139
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
140
141
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
142
                                     hardlink=False):
143
        """Create a new heavyweight checkout of this branch.
144
145
        :param to_location: URL of location to create the new checkout in.
146
        :param revision_id: Revision that should be the tip of the checkout.
147
        :param hardlink: Whether to hardlink
148
        :return: WorkingTree object of checkout.
149
        """
150
        checkout_branch = BzrDir.create_branch_convenience(
151
            to_location, force_new_tree=False, format=get_rich_root_format())
152
        checkout = checkout_branch.bzrdir
153
        checkout_branch.bind(self)
154
        # pull up to the specified revision_id to set the initial 
155
        # branch tip correctly, and seed it with history.
156
        checkout_branch.pull(self, stop_revision=revision_id)
157
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
158
0.200.82 by Jelmer Vernooij
Support listing tags.
159
    def _make_tags(self):
0.200.89 by Jelmer Vernooij
Support sprouting branches.
160
        return GitTagDict(self)
0.200.82 by Jelmer Vernooij
Support listing tags.
161
0.200.57 by Jelmer Vernooij
Fix more tests.
162
    def _gen_revision_history(self):
0.200.58 by Jelmer Vernooij
Fix remaining tests.
163
        if self.head is None:
164
            return []
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
165
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
166
        ret.reverse()
0.200.57 by Jelmer Vernooij
Fix more tests.
167
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
168
169
    def get_config(self):
170
        return GitBranchConfig(self)
171
172
    def get_push_location(self):
173
        """See Branch.get_push_location."""
174
        push_loc = self.get_config().get_user_option('push_location')
175
        return push_loc
176
177
    def set_push_location(self, location):
178
        """See Branch.set_push_location."""
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
179
        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.
180
                                          store=config.STORE_LOCATION)
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
181
182
    def supports_tags(self):
0.200.82 by Jelmer Vernooij
Support listing tags.
183
        return True
0.200.96 by Jelmer Vernooij
Fix branch.
184
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