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