/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) 2008-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 Repository and a Bazaar Branch"""
19
0.200.45 by David Allouche
More performance hacking, introduce sqlite cache, escape characters in commits that break serializers.
20
import bzrlib
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
21
from bzrlib import (
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
22
    errors,
0.200.132 by Jelmer Vernooij
Use parents cache, don't set author revision property if it's equal to committer.
23
    graph,
0.200.38 by David Allouche
Reimplement GitRepository.get_inventory, simpler and faster.
24
    inventory,
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
25
    osutils,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
26
    repository,
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
27
    revision,
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
28
    revisiontree,
0.200.211 by Jelmer Vernooij
Add basic infrastructure for dpush.
29
    ui,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
30
    urlutils,
31
    )
0.200.115 by Jelmer Vernooij
Pass mapping object.
32
from bzrlib.foreign import (
0.200.292 by Jelmer Vernooij
Fix formatting.
33
    ForeignRepository,
34
    )
35
from bzrlib.trace import (
36
    mutter,
37
    )
38
from bzrlib.transport import (
39
    get_transport,
40
    )
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
41
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
42
from bzrlib.plugins.git.commit import (
43
    GitCommitBuilder,
44
    )
0.200.335 by Jelmer Vernooij
Move inventory code to separate module.
45
from bzrlib.plugins.git.inventory import (
0.200.336 by Jelmer Vernooij
Use custom GitInventory class.
46
    GitInventory,
0.200.335 by Jelmer Vernooij
Move inventory code to separate module.
47
    )
0.200.256 by Jelmer Vernooij
Add tests for import_revision_gist.
48
from bzrlib.plugins.git.mapping import (
49
    default_mapping,
0.200.395 by Jelmer Vernooij
Set vcs attribute on GitRepository.
50
    foreign_git,
0.200.256 by Jelmer Vernooij
Add tests for import_revision_gist.
51
    mapping_registry,
52
    )
0.200.292 by Jelmer Vernooij
Fix formatting.
53
from bzrlib.plugins.git.versionedfiles import (
0.200.506 by Jelmer Vernooij
Remove bzr-foreign.
54
    GitRevisions,
0.200.292 by Jelmer Vernooij
Fix formatting.
55
    GitTexts,
56
    )
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
57
58
0.200.115 by Jelmer Vernooij
Pass mapping object.
59
class GitRepository(ForeignRepository):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
60
    """An adapter to git repositories for bzr."""
61
0.200.41 by David Allouche
Define _serializer = None in GitRepository.
62
    _serializer = None
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
63
    _commit_builder_class = GitCommitBuilder
0.200.395 by Jelmer Vernooij
Set vcs attribute on GitRepository.
64
    vcs = foreign_git
0.200.41 by David Allouche
Define _serializer = None in GitRepository.
65
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
66
    def __init__(self, gitdir, lockfiles):
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
67
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
68
            lockfiles)
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
69
        from bzrlib.plugins.git import fetch, push
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
70
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
71
                          fetch.InterLocalGitNonGitRepository,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
72
                          fetch.InterGitGitRepository,
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
73
                          push.InterToLocalGitRepository,
74
                          push.InterToRemoteGitRepository]:
0.200.276 by Jelmer Vernooij
Improve formatting.
75
            repository.InterRepository.register_optimiser(optimiser)
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
76
77
    def is_shared(self):
78
        return True
79
80
    def supports_rich_root(self):
81
        return True
82
83
    def _warn_if_deprecated(self):
84
        # This class isn't deprecated
85
        pass
86
87
    def get_mapping(self):
88
        return default_mapping
89
0.200.147 by Jelmer Vernooij
Merge new dulwich; fetching objects from local repository works now; they aren't converted yet though.
90
    def make_working_trees(self):
91
        return True
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
92
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
93
    def dfetch(self, source, stop_revision):
94
        interrepo = repository.InterRepository.get(source, self)
95
        return interrepo.dfetch(stop_revision)
96
0.200.428 by Jelmer Vernooij
use dfetch_refs, to prepare for dpush to remote repositories.
97
    def dfetch_refs(self, source, stop_revision):
98
        interrepo = repository.InterRepository.get(source, self)
99
        return interrepo.dfetch_refs(stop_revision)
100
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
101
102
class LocalGitRepository(GitRepository):
0.200.276 by Jelmer Vernooij
Improve formatting.
103
    """Git repository on the file system."""
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
104
105
    def __init__(self, gitdir, lockfiles):
0.200.132 by Jelmer Vernooij
Use parents cache, don't set author revision property if it's equal to committer.
106
        # FIXME: This also caches negatives. Need to be more careful 
107
        # about this once we start writing to git
108
        self._parents_provider = graph.CachingParentsProvider(self)
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
109
        GitRepository.__init__(self, gitdir, lockfiles)
0.200.61 by Jelmer Vernooij
Fix tests.
110
        self.base = gitdir.root_transport.base
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
111
        self._git = gitdir._git
0.200.56 by Jelmer Vernooij
Switch to using GitPython rather than our own in-house stuff.
112
        self.texts = None
0.200.506 by Jelmer Vernooij
Remove bzr-foreign.
113
        self.signatures = None
114
        self.revisions = GitRevisions(self._git.object_store)
115
        self.inventories = None
0.200.209 by Jelmer Vernooij
Pass repository object to versionedfiles.
116
        self.texts = GitTexts(self)
0.200.45 by David Allouche
More performance hacking, introduce sqlite cache, escape characters in commits that break serializers.
117
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
118
    def all_revision_ids(self):
119
        ret = set([revision.NULL_REVISION])
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
120
        heads = self._git.refs.as_dict('refs/heads')
0.200.254 by Jelmer Vernooij
Fix tests.
121
        if heads == {}:
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
122
            return ret
0.200.254 by Jelmer Vernooij
Fix tests.
123
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
124
        ret = set(bzr_heads)
125
        graph = self.get_graph()
126
        for rev, parents in graph.iter_ancestry(bzr_heads):
127
            ret.add(rev)
0.200.74 by Jelmer Vernooij
Implement Repository.all_revision_ids().
128
        return ret
129
0.200.132 by Jelmer Vernooij
Use parents cache, don't set author revision property if it's equal to committer.
130
    def _make_parents_provider(self):
131
        """See Repository._make_parents_provider()."""
132
        return self._parents_provider
133
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
134
    def get_parent_map(self, revids):
135
        parent_map = {}
136
        for revision_id in revids:
137
            assert isinstance(revision_id, str)
138
            if revision_id == revision.NULL_REVISION:
139
                parent_map[revision_id] = ()
140
                continue
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
141
            hexsha, mapping = self.lookup_git_revid(revision_id)
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
142
            commit  = self._git.commit(hexsha)
143
            if commit is None:
144
                continue
145
            else:
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
146
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
147
        return parent_map
148
149
    def get_ancestry(self, revision_id, topo_sorted=True):
150
        """See Repository.get_ancestry().
151
        """
152
        if revision_id is None:
0.200.237 by Jelmer Vernooij
Fix get_ancestry() contents.
153
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
154
        assert isinstance(revision_id, str)
155
        ancestry = []
156
        graph = self.get_graph()
157
        for rev, parents in graph.iter_ancestry([revision_id]):
158
            ancestry.append(rev)
159
        ancestry.reverse()
0.200.237 by Jelmer Vernooij
Fix get_ancestry() contents.
160
        return [None] + ancestry
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
161
162
    def get_signature_text(self, revision_id):
163
        raise errors.NoSuchRevision(self, revision_id)
164
0.200.124 by Jelmer Vernooij
Add lookup_revision_id stub.
165
    def lookup_revision_id(self, revid):
166
        """Lookup a revision id.
167
        
168
        :param revid: Bazaar revision id.
169
        :return: Tuple with git revisionid and mapping.
170
        """
171
        # Yes, this doesn't really work, but good enough as a stub
172
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
173
0.200.60 by Jelmer Vernooij
Support signature functions.
174
    def has_signature_for_revision_id(self, revision_id):
175
        return False
176
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
177
    def lookup_git_revid(self, bzr_revid):
0.200.105 by Jelmer Vernooij
Add common function for finding git commit by bzr revid.
178
        try:
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
179
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
0.200.105 by Jelmer Vernooij
Add common function for finding git commit by bzr revid.
180
        except errors.InvalidRevisionId:
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
181
            raise errors.NoSuchRevision(self, bzr_revid)
0.200.105 by Jelmer Vernooij
Add common function for finding git commit by bzr revid.
182
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
183
    def get_revision(self, revision_id):
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
184
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
0.200.147 by Jelmer Vernooij
Merge new dulwich; fetching objects from local repository works now; they aren't converted yet though.
185
        try:
186
            commit = self._git.commit(git_commit_id)
187
        except KeyError:
188
            raise errors.NoSuchRevision(self, revision_id)
0.204.5 by James Westby
Lose the debuggin prints.
189
        # print "fetched revision:", git_commit_id
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
190
        revision = mapping.import_commit(commit)
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
191
        assert revision is not None
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
192
        return revision
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
193
194
    def has_revision(self, revision_id):
195
        try:
196
            self.get_revision(revision_id)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
197
        except errors.NoSuchRevision:
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
198
            return False
199
        else:
200
            return True
201
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
202
    def get_revisions(self, revids):
0.200.134 by Jelmer Vernooij
Fix get_revisions().
203
        return [self.get_revision(r) for r in revids]
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
204
205
    def revision_trees(self, revids):
206
        for revid in revids:
207
            yield self.revision_tree(revid)
208
209
    def revision_tree(self, revision_id):
0.200.57 by Jelmer Vernooij
Fix more tests.
210
        revision_id = revision.ensure_null(revision_id)
211
        if revision_id == revision.NULL_REVISION:
212
            inv = inventory.Inventory(root_id=None)
213
            inv.revision_id = revision_id
214
            return revisiontree.RevisionTree(self, inv, revision_id)
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
215
        return GitRevisionTree(self, revision_id)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
216
217
    def get_inventory(self, revision_id):
0.200.57 by Jelmer Vernooij
Fix more tests.
218
        assert revision_id != None
219
        return self.revision_tree(revision_id).inventory
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
220
0.200.108 by Jelmer Vernooij
Support bzr init --git.
221
    def set_make_working_trees(self, trees):
222
        pass
223
0.200.276 by Jelmer Vernooij
Improve formatting.
224
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
225
        progress=None):
0.200.146 by Jelmer Vernooij
Merge dulwich.
226
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
227
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
228
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
229
class GitRevisionTree(revisiontree.RevisionTree):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
230
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
231
    def __init__(self, repository, revision_id):
0.200.516 by Jelmer Vernooij
Simplify RevisionTree a bit.
232
        self._revision_id = revision_id
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
233
        self._repository = repository
0.200.516 by Jelmer Vernooij
Simplify RevisionTree a bit.
234
        store = repository._git.object_store
0.200.149 by Jelmer Vernooij
Raise proper NoSuchRevision exception.
235
        assert isinstance(revision_id, str)
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
236
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
0.200.149 by Jelmer Vernooij
Raise proper NoSuchRevision exception.
237
        try:
0.200.516 by Jelmer Vernooij
Simplify RevisionTree a bit.
238
            commit = store[git_id]
0.200.153 by Jelmer Vernooij
Merge new dulwich.
239
        except KeyError, r:
0.200.149 by Jelmer Vernooij
Raise proper NoSuchRevision exception.
240
            raise errors.NoSuchRevision(repository, revision_id)
0.200.153 by Jelmer Vernooij
Merge new dulwich.
241
        self.tree = commit.tree
0.200.516 by Jelmer Vernooij
Simplify RevisionTree a bit.
242
        self._inventory = GitInventory(self.tree, self.mapping, store, 
243
                                       revision_id)
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
244
0.200.79 by Jelmer Vernooij
Implement RevisionTree.get_revision_id().
245
    def get_revision_id(self):
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
246
        return self._revision_id
0.200.79 by Jelmer Vernooij
Implement RevisionTree.get_revision_id().
247
0.200.518 by Jelmer Vernooij
Support path argument to get_file_text.
248
    def get_file_text(self, file_id, path=None):
249
        if path is not None:
250
            entry = self._inventory._get_ie(path)
251
        else:
252
            entry = self._inventory[file_id]
0.200.87 by Jelmer Vernooij
Remove cache usage.
253
        if entry.kind == 'directory': return ""
0.200.337 by Jelmer Vernooij
Use CommonInventory to lazily evaluate trees.
254
        return entry.object.data
0.203.1 by Aaron Bentley
Make checkouts work
255
0.200.429 by Jelmer Vernooij
get remote dpush to a point where we now what to send.
256
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
257
class GitRepositoryFormat(repository.RepositoryFormat):
0.200.429 by Jelmer Vernooij
get remote dpush to a point where we now what to send.
258
    """Git repository format."""
0.203.1 by Aaron Bentley
Make checkouts work
259
260
    supports_tree_reference = False
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
261
    rich_root_data = True
0.200.71 by Jelmer Vernooij
Implement GitRepositoryFormat.get_format_description.
262
263
    def get_format_description(self):
264
        return "Git Repository"
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
265
266
    def initialize(self, url, shared=False, _internal=False):
267
        raise bzr_errors.UninitializableFormat(self)
268
269
    def check_conversion_target(self, target_repo_format):
270
        return target_repo_format.rich_root_data