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