/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
20
from bzrlib import (
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
21
    errors,
0.200.38 by David Allouche
Reimplement GitRepository.get_inventory, simpler and faster.
22
    inventory,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
23
    repository,
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
24
    revision,
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
25
    revisiontree,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
26
    )
0.200.115 by Jelmer Vernooij
Pass mapping object.
27
from bzrlib.foreign import (
0.200.292 by Jelmer Vernooij
Fix formatting.
28
    ForeignRepository,
29
    )
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
30
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
31
from bzrlib.plugins.git.commit import (
32
    GitCommitBuilder,
33
    )
0.200.256 by Jelmer Vernooij
Add tests for import_revision_gist.
34
from bzrlib.plugins.git.mapping import (
35
    default_mapping,
0.200.395 by Jelmer Vernooij
Set vcs attribute on GitRepository.
36
    foreign_git,
0.200.256 by Jelmer Vernooij
Add tests for import_revision_gist.
37
    mapping_registry,
38
    )
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
39
from bzrlib.plugins.git.tree import (
40
    GitRevisionTree,
41
    )
0.200.292 by Jelmer Vernooij
Fix formatting.
42
from bzrlib.plugins.git.versionedfiles import (
0.200.506 by Jelmer Vernooij
Remove bzr-foreign.
43
    GitRevisions,
0.200.292 by Jelmer Vernooij
Fix formatting.
44
    GitTexts,
45
    )
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
46
47
0.252.21 by Jelmer Vernooij
Fix GitRepository.all_revision_ids() to find all revisions.
48
from dulwich.objects import (
49
    Commit,
50
    )
51
52
0.200.115 by Jelmer Vernooij
Pass mapping object.
53
class GitRepository(ForeignRepository):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
54
    """An adapter to git repositories for bzr."""
55
0.200.41 by David Allouche
Define _serializer = None in GitRepository.
56
    _serializer = None
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
57
    _commit_builder_class = GitCommitBuilder
0.200.395 by Jelmer Vernooij
Set vcs attribute on GitRepository.
58
    vcs = foreign_git
0.200.41 by David Allouche
Define _serializer = None in GitRepository.
59
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
60
    def __init__(self, gitdir, lockfiles):
0.200.676 by Jelmer Vernooij
Avoid iterating over all keys in the tdb database.
61
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
62
            lockfiles)
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
63
        from bzrlib.plugins.git import fetch, push
0.200.676 by Jelmer Vernooij
Avoid iterating over all keys in the tdb database.
64
        for optimiser in [fetch.InterRemoteGitNonGitRepository,
0.200.306 by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository.
65
                          fetch.InterLocalGitNonGitRepository,
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
66
                          fetch.InterGitGitRepository,
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
67
                          push.InterToLocalGitRepository,
68
                          push.InterToRemoteGitRepository]:
0.200.276 by Jelmer Vernooij
Improve formatting.
69
            repository.InterRepository.register_optimiser(optimiser)
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
70
71
    def is_shared(self):
0.200.886 by Jelmer Vernooij
Git repositories are not shared.
72
        return False
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
73
74
    def supports_rich_root(self):
75
        return True
76
0.200.723 by Jelmer Vernooij
cope with branch argument to _warn_if_deprecated
77
    def _warn_if_deprecated(self, branch=None):
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
78
        # This class isn't deprecated
79
        pass
80
81
    def get_mapping(self):
82
        return default_mapping
83
0.200.147 by Jelmer Vernooij
Merge new dulwich; fetching objects from local repository works now; they aren't converted yet though.
84
    def make_working_trees(self):
85
        return True
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
86
0.200.557 by Jelmer Vernooij
Implement GitRepository.revision_graph_can_have_wrong_parents().
87
    def revision_graph_can_have_wrong_parents(self):
88
        return False
89
0.200.425 by Jelmer Vernooij
Split out push to remote git repositories.
90
    def dfetch(self, source, stop_revision):
91
        interrepo = repository.InterRepository.get(source, self)
92
        return interrepo.dfetch(stop_revision)
93
0.200.428 by Jelmer Vernooij
use dfetch_refs, to prepare for dpush to remote repositories.
94
    def dfetch_refs(self, source, stop_revision):
95
        interrepo = repository.InterRepository.get(source, self)
96
        return interrepo.dfetch_refs(stop_revision)
97
0.252.5 by Jelmer Vernooij
enable 'bzr push'.
98
    def fetch_refs(self, source, stop_revision):
99
        interrepo = repository.InterRepository.get(source, self)
100
        return interrepo.fetch_refs(stop_revision)
101
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
102
103
class LocalGitRepository(GitRepository):
0.200.276 by Jelmer Vernooij
Improve formatting.
104
    """Git repository on the file system."""
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
105
106
    def __init__(self, gitdir, lockfiles):
107
        GitRepository.__init__(self, gitdir, lockfiles)
0.200.61 by Jelmer Vernooij
Fix tests.
108
        self.base = gitdir.root_transport.base
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
109
        self._git = gitdir._git
0.200.506 by Jelmer Vernooij
Remove bzr-foreign.
110
        self.signatures = None
0.200.649 by Jelmer Vernooij
Make GitRevisions VF implementation behave as the interface expects.
111
        self.revisions = GitRevisions(self, self._git.object_store)
0.200.506 by Jelmer Vernooij
Remove bzr-foreign.
112
        self.inventories = None
0.200.209 by Jelmer Vernooij
Pass repository object to versionedfiles.
113
        self.texts = GitTexts(self)
0.200.45 by David Allouche
More performance hacking, introduce sqlite cache, escape characters in commits that break serializers.
114
0.252.46 by Jelmer Vernooij
Generate refs/bzr/* if not set yet.
115
    def _iter_revision_ids(self):
0.252.21 by Jelmer Vernooij
Fix GitRepository.all_revision_ids() to find all revisions.
116
        for sha in self._git.object_store:
117
            o = self._git.object_store[sha]
118
            if not isinstance(o, Commit):
119
                continue
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
120
            rev = self.get_mapping().import_commit(o,
121
                self.lookup_foreign_revision_id)
0.252.46 by Jelmer Vernooij
Generate refs/bzr/* if not set yet.
122
            yield o.id, rev.revision_id
123
124
    def all_revision_ids(self):
125
        ret = set([])
126
        for git_sha, revid in self._iter_revision_ids():
127
            ret.add(revid)
0.200.74 by Jelmer Vernooij
Implement Repository.all_revision_ids().
128
        return ret
129
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
130
    def get_parent_map(self, revids):
131
        parent_map = {}
132
        for revision_id in revids:
133
            assert isinstance(revision_id, str)
134
            if revision_id == revision.NULL_REVISION:
135
                parent_map[revision_id] = ()
136
                continue
0.200.650 by Jelmer Vernooij
Use standard names for lookup functions.
137
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
0.200.612 by Jelmer Vernooij
Cope with Dulwich returning KeyError when a commit is not found.
138
            try:
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
139
                commit = self._git[hexsha]
0.200.612 by Jelmer Vernooij
Cope with Dulwich returning KeyError when a commit is not found.
140
            except KeyError:
141
                continue
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
142
            parent_map[revision_id] = [self.lookup_foreign_revision_id(p, mapping) for p in commit.parents]
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
143
        return parent_map
144
145
    def get_ancestry(self, revision_id, topo_sorted=True):
146
        """See Repository.get_ancestry().
147
        """
148
        if revision_id is None:
0.200.237 by Jelmer Vernooij
Fix get_ancestry() contents.
149
            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.
150
        assert isinstance(revision_id, str)
151
        ancestry = []
152
        graph = self.get_graph()
153
        for rev, parents in graph.iter_ancestry([revision_id]):
154
            ancestry.append(rev)
155
        ancestry.reverse()
0.200.237 by Jelmer Vernooij
Fix get_ancestry() contents.
156
        return [None] + ancestry
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
157
158
    def get_signature_text(self, revision_id):
159
        raise errors.NoSuchRevision(self, revision_id)
160
0.200.650 by Jelmer Vernooij
Use standard names for lookup functions.
161
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
0.200.124 by Jelmer Vernooij
Add lookup_revision_id stub.
162
        """Lookup a revision id.
0.200.676 by Jelmer Vernooij
Avoid iterating over all keys in the tdb database.
163
0.200.124 by Jelmer Vernooij
Add lookup_revision_id stub.
164
        """
0.200.649 by Jelmer Vernooij
Make GitRevisions VF implementation behave as the interface expects.
165
        if mapping is None:
166
            mapping = self.get_mapping()
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
167
        from dulwich.protocol import (
168
            ZERO_SHA,
169
            )
0.200.914 by Jelmer Vernooij
Fix tests.
170
        if foreign_revid == ZERO_SHA:
171
            return revision.NULL_REVISION
0.252.45 by Jelmer Vernooij
Finish fetching roundtripped revisions back into bzr.
172
        commit = self._git[foreign_revid]
173
        rev = mapping.import_commit(commit, lambda x: None)
174
        return rev.revision_id
0.200.124 by Jelmer Vernooij
Add lookup_revision_id stub.
175
0.200.60 by Jelmer Vernooij
Support signature functions.
176
    def has_signature_for_revision_id(self, revision_id):
177
        return False
178
0.200.913 by Jelmer Vernooij
Fix tests.
179
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
0.200.105 by Jelmer Vernooij
Add common function for finding git commit by bzr revid.
180
        try:
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
181
            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.
182
        except errors.InvalidRevisionId:
0.200.913 by Jelmer Vernooij
Fix tests.
183
            if mapping is None:
184
                mapping = self.get_mapping()
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
185
            try:
0.252.31 by Jelmer Vernooij
Properly escape revids when using them in ref names.
186
                return self._git.refs[mapping.revid_as_refname(bzr_revid)], mapping
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
187
            except KeyError:
0.252.46 by Jelmer Vernooij
Generate refs/bzr/* if not set yet.
188
                # Update refs from Git commit objects
189
                # FIXME: Hitting this a lot will be very inefficient...
0.200.913 by Jelmer Vernooij
Fix tests.
190
                for git_sha, revid in self._iter_revision_ids():
191
                    self._git.refs[mapping.revid_as_refname(revid)] = git_sha
192
                    if revid == bzr_revid:
193
                        return git_sha, mapping
194
                raise errors.NoSuchRevision(self, bzr_revid)
0.200.105 by Jelmer Vernooij
Add common function for finding git commit by bzr revid.
195
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
196
    def get_revision(self, revision_id):
0.200.650 by Jelmer Vernooij
Use standard names for lookup functions.
197
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
0.200.147 by Jelmer Vernooij
Merge new dulwich; fetching objects from local repository works now; they aren't converted yet though.
198
        try:
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
199
            commit = self._git[git_commit_id]
0.200.147 by Jelmer Vernooij
Merge new dulwich; fetching objects from local repository works now; they aren't converted yet though.
200
        except KeyError:
201
            raise errors.NoSuchRevision(self, revision_id)
0.204.5 by James Westby
Lose the debuggin prints.
202
        # print "fetched revision:", git_commit_id
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
203
        revision = mapping.import_commit(commit,
204
            self.lookup_foreign_revision_id)
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
205
        assert revision is not None
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
206
        return revision
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
207
208
    def has_revision(self, revision_id):
209
        try:
0.200.902 by Jelmer Vernooij
Fix Repository.has_revision{s,}.
210
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
211
        except errors.NoSuchRevision:
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
212
            return False
0.200.902 by Jelmer Vernooij
Fix Repository.has_revision{s,}.
213
        return (git_commit_id in self._git)
214
215
    def has_revisions(self, revision_ids):
0.200.913 by Jelmer Vernooij
Fix tests.
216
        return set(filter(self.has_revision, revision_ids))
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
217
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
218
    def get_revisions(self, revids):
0.200.134 by Jelmer Vernooij
Fix get_revisions().
219
        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.
220
221
    def revision_trees(self, revids):
222
        for revid in revids:
223
            yield self.revision_tree(revid)
224
225
    def revision_tree(self, revision_id):
0.200.57 by Jelmer Vernooij
Fix more tests.
226
        revision_id = revision.ensure_null(revision_id)
227
        if revision_id == revision.NULL_REVISION:
228
            inv = inventory.Inventory(root_id=None)
229
            inv.revision_id = revision_id
230
            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.
231
        return GitRevisionTree(self, revision_id)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
232
233
    def get_inventory(self, revision_id):
0.200.57 by Jelmer Vernooij
Fix more tests.
234
        assert revision_id != None
235
        return self.revision_tree(revision_id).inventory
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
236
0.200.108 by Jelmer Vernooij
Support bzr init --git.
237
    def set_make_working_trees(self, trees):
238
        pass
239
0.200.276 by Jelmer Vernooij
Improve formatting.
240
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
241
        progress=None):
0.200.146 by Jelmer Vernooij
Merge dulwich.
242
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
243
0.200.701 by Jelmer Vernooij
Fix check in git repos.
244
    def _get_versioned_file_checker(self, text_key_references=None,
245
                        ancestors=None):
246
        return GitVersionedFileChecker(self,
247
            text_key_references=text_key_references, ancestors=ancestors)
248
    
249
250
class GitVersionedFileChecker(repository._VersionedFileChecker):
251
252
    file_ids = []
253
254
    def _check_file_version_parents(self, texts, progress_bar):
255
        return {}, []
256
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
257
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
258
class GitRepositoryFormat(repository.RepositoryFormat):
0.200.429 by Jelmer Vernooij
get remote dpush to a point where we now what to send.
259
    """Git repository format."""
0.203.1 by Aaron Bentley
Make checkouts work
260
261
    supports_tree_reference = False
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
262
    rich_root_data = True
0.200.71 by Jelmer Vernooij
Implement GitRepositoryFormat.get_format_description.
263
264
    def get_format_description(self):
265
        return "Git Repository"
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
266
267
    def initialize(self, url, shared=False, _internal=False):
0.200.586 by Jelmer Vernooij
Fix issues pointed out by pyflakes.
268
        raise errors.UninitializableFormat(self)
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
269
270
    def check_conversion_target(self, target_repo_format):
271
        return target_repo_format.rich_root_data
0.200.536 by Jelmer Vernooij
Implement network name.
272
0.200.658 by Jelmer Vernooij
Provide right infrastructure for foreign repository tests from bzrlib.
273
    def get_foreign_tests_repository_factory(self):
0.200.713 by Jelmer Vernooij
Improve formatting.
274
        from bzrlib.plugins.git.tests.test_repository import (
275
            ForeignTestsRepositoryFactory,
276
            )
0.200.658 by Jelmer Vernooij
Provide right infrastructure for foreign repository tests from bzrlib.
277
        return ForeignTestsRepositoryFactory()
278
0.200.536 by Jelmer Vernooij
Implement network name.
279
    def network_name(self):
280
        return "git"