/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.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
94
95
class LocalGitRepository(GitRepository):
0.200.276 by Jelmer Vernooij
Improve formatting.
96
    """Git repository on the file system."""
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
97
98
    def __init__(self, gitdir, lockfiles):
99
        GitRepository.__init__(self, gitdir, lockfiles)
0.200.61 by Jelmer Vernooij
Fix tests.
100
        self.base = gitdir.root_transport.base
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
101
        self._git = gitdir._git
0.200.506 by Jelmer Vernooij
Remove bzr-foreign.
102
        self.signatures = None
0.200.649 by Jelmer Vernooij
Make GitRevisions VF implementation behave as the interface expects.
103
        self.revisions = GitRevisions(self, self._git.object_store)
0.200.506 by Jelmer Vernooij
Remove bzr-foreign.
104
        self.inventories = None
0.200.209 by Jelmer Vernooij
Pass repository object to versionedfiles.
105
        self.texts = GitTexts(self)
0.200.45 by David Allouche
More performance hacking, introduce sqlite cache, escape characters in commits that break serializers.
106
0.252.46 by Jelmer Vernooij
Generate refs/bzr/* if not set yet.
107
    def _iter_revision_ids(self):
0.252.21 by Jelmer Vernooij
Fix GitRepository.all_revision_ids() to find all revisions.
108
        for sha in self._git.object_store:
109
            o = self._git.object_store[sha]
110
            if not isinstance(o, Commit):
111
                continue
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
112
            rev = self.get_mapping().import_commit(o,
113
                self.lookup_foreign_revision_id)
0.252.46 by Jelmer Vernooij
Generate refs/bzr/* if not set yet.
114
            yield o.id, rev.revision_id
115
116
    def all_revision_ids(self):
117
        ret = set([])
118
        for git_sha, revid in self._iter_revision_ids():
119
            ret.add(revid)
0.200.74 by Jelmer Vernooij
Implement Repository.all_revision_ids().
120
        return ret
121
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
122
    def get_parent_map(self, revids):
123
        parent_map = {}
124
        for revision_id in revids:
125
            assert isinstance(revision_id, str)
126
            if revision_id == revision.NULL_REVISION:
127
                parent_map[revision_id] = ()
128
                continue
0.200.650 by Jelmer Vernooij
Use standard names for lookup functions.
129
            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.
130
            try:
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
131
                commit = self._git[hexsha]
0.200.612 by Jelmer Vernooij
Cope with Dulwich returning KeyError when a commit is not found.
132
            except KeyError:
133
                continue
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
134
            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.
135
        return parent_map
136
137
    def get_ancestry(self, revision_id, topo_sorted=True):
138
        """See Repository.get_ancestry().
139
        """
140
        if revision_id is None:
0.200.237 by Jelmer Vernooij
Fix get_ancestry() contents.
141
            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.
142
        assert isinstance(revision_id, str)
143
        ancestry = []
144
        graph = self.get_graph()
145
        for rev, parents in graph.iter_ancestry([revision_id]):
146
            ancestry.append(rev)
147
        ancestry.reverse()
0.200.237 by Jelmer Vernooij
Fix get_ancestry() contents.
148
        return [None] + ancestry
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
149
150
    def get_signature_text(self, revision_id):
151
        raise errors.NoSuchRevision(self, revision_id)
152
0.257.1 by Jelmer Vernooij
use transport repo objects even for local access.
153
    def pack(self, hint=None, clean_obsolete_packs=False):
154
        self._git.object_store.pack_loose_objects()
155
0.200.650 by Jelmer Vernooij
Use standard names for lookup functions.
156
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
0.200.124 by Jelmer Vernooij
Add lookup_revision_id stub.
157
        """Lookup a revision id.
0.200.676 by Jelmer Vernooij
Avoid iterating over all keys in the tdb database.
158
0.200.124 by Jelmer Vernooij
Add lookup_revision_id stub.
159
        """
0.200.649 by Jelmer Vernooij
Make GitRevisions VF implementation behave as the interface expects.
160
        if mapping is None:
161
            mapping = self.get_mapping()
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
162
        from dulwich.protocol import (
163
            ZERO_SHA,
164
            )
0.200.914 by Jelmer Vernooij
Fix tests.
165
        if foreign_revid == ZERO_SHA:
166
            return revision.NULL_REVISION
0.252.45 by Jelmer Vernooij
Finish fetching roundtripped revisions back into bzr.
167
        commit = self._git[foreign_revid]
168
        rev = mapping.import_commit(commit, lambda x: None)
169
        return rev.revision_id
0.200.124 by Jelmer Vernooij
Add lookup_revision_id stub.
170
0.200.60 by Jelmer Vernooij
Support signature functions.
171
    def has_signature_for_revision_id(self, revision_id):
172
        return False
173
0.200.913 by Jelmer Vernooij
Fix tests.
174
    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.
175
        try:
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
176
            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.
177
        except errors.InvalidRevisionId:
0.200.913 by Jelmer Vernooij
Fix tests.
178
            if mapping is None:
179
                mapping = self.get_mapping()
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
180
            try:
0.252.31 by Jelmer Vernooij
Properly escape revids when using them in ref names.
181
                return self._git.refs[mapping.revid_as_refname(bzr_revid)], mapping
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
182
            except KeyError:
0.252.46 by Jelmer Vernooij
Generate refs/bzr/* if not set yet.
183
                # Update refs from Git commit objects
184
                # FIXME: Hitting this a lot will be very inefficient...
0.200.913 by Jelmer Vernooij
Fix tests.
185
                for git_sha, revid in self._iter_revision_ids():
186
                    self._git.refs[mapping.revid_as_refname(revid)] = git_sha
187
                    if revid == bzr_revid:
188
                        return git_sha, mapping
189
                raise errors.NoSuchRevision(self, bzr_revid)
0.200.105 by Jelmer Vernooij
Add common function for finding git commit by bzr revid.
190
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
191
    def get_revision(self, revision_id):
0.200.650 by Jelmer Vernooij
Use standard names for lookup functions.
192
        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.
193
        try:
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
194
            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.
195
        except KeyError:
196
            raise errors.NoSuchRevision(self, revision_id)
0.204.5 by James Westby
Lose the debuggin prints.
197
        # 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.
198
        revision = mapping.import_commit(commit,
199
            self.lookup_foreign_revision_id)
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
200
        assert revision is not None
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
201
        return revision
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
202
203
    def has_revision(self, revision_id):
204
        try:
0.200.902 by Jelmer Vernooij
Fix Repository.has_revision{s,}.
205
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
206
        except errors.NoSuchRevision:
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
207
            return False
0.200.902 by Jelmer Vernooij
Fix Repository.has_revision{s,}.
208
        return (git_commit_id in self._git)
209
210
    def has_revisions(self, revision_ids):
0.200.913 by Jelmer Vernooij
Fix tests.
211
        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.
212
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
213
    def get_revisions(self, revids):
0.200.134 by Jelmer Vernooij
Fix get_revisions().
214
        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.
215
216
    def revision_trees(self, revids):
217
        for revid in revids:
218
            yield self.revision_tree(revid)
219
220
    def revision_tree(self, revision_id):
0.200.57 by Jelmer Vernooij
Fix more tests.
221
        revision_id = revision.ensure_null(revision_id)
222
        if revision_id == revision.NULL_REVISION:
223
            inv = inventory.Inventory(root_id=None)
224
            inv.revision_id = revision_id
225
            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.
226
        return GitRevisionTree(self, revision_id)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
227
228
    def get_inventory(self, revision_id):
0.200.57 by Jelmer Vernooij
Fix more tests.
229
        assert revision_id != None
230
        return self.revision_tree(revision_id).inventory
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
231
0.200.108 by Jelmer Vernooij
Support bzr init --git.
232
    def set_make_working_trees(self, trees):
233
        pass
234
0.200.276 by Jelmer Vernooij
Improve formatting.
235
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
236
        progress=None):
0.200.146 by Jelmer Vernooij
Merge dulwich.
237
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
238
0.200.701 by Jelmer Vernooij
Fix check in git repos.
239
    def _get_versioned_file_checker(self, text_key_references=None,
240
                        ancestors=None):
241
        return GitVersionedFileChecker(self,
242
            text_key_references=text_key_references, ancestors=ancestors)
243
    
244
245
class GitVersionedFileChecker(repository._VersionedFileChecker):
246
247
    file_ids = []
248
249
    def _check_file_version_parents(self, texts, progress_bar):
250
        return {}, []
251
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
252
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
253
class GitRepositoryFormat(repository.RepositoryFormat):
0.200.429 by Jelmer Vernooij
get remote dpush to a point where we now what to send.
254
    """Git repository format."""
0.203.1 by Aaron Bentley
Make checkouts work
255
256
    supports_tree_reference = False
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
257
    rich_root_data = True
0.200.71 by Jelmer Vernooij
Implement GitRepositoryFormat.get_format_description.
258
259
    def get_format_description(self):
260
        return "Git Repository"
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
261
262
    def initialize(self, url, shared=False, _internal=False):
0.200.586 by Jelmer Vernooij
Fix issues pointed out by pyflakes.
263
        raise errors.UninitializableFormat(self)
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
264
265
    def check_conversion_target(self, target_repo_format):
266
        return target_repo_format.rich_root_data
0.200.536 by Jelmer Vernooij
Implement network name.
267
0.200.658 by Jelmer Vernooij
Provide right infrastructure for foreign repository tests from bzrlib.
268
    def get_foreign_tests_repository_factory(self):
0.200.713 by Jelmer Vernooij
Improve formatting.
269
        from bzrlib.plugins.git.tests.test_repository import (
270
            ForeignTestsRepositoryFactory,
271
            )
0.200.658 by Jelmer Vernooij
Provide right infrastructure for foreign repository tests from bzrlib.
272
        return ForeignTestsRepositoryFactory()
273
0.200.536 by Jelmer Vernooij
Implement network name.
274
    def network_name(self):
275
        return "git"