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