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