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