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