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