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