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