/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
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""An adapter between a Git Repository and a Bazaar Branch"""
18
0.200.45 by David Allouche
More performance hacking, introduce sqlite cache, escape characters in commits that break serializers.
19
import os
0.200.57 by Jelmer Vernooij
Fix more tests.
20
import time
0.200.45 by David Allouche
More performance hacking, introduce sqlite cache, escape characters in commits that break serializers.
21
22
import bzrlib
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
23
from bzrlib import (
0.200.20 by John Arbash Meinel
All tests are passing again
24
    deprecated_graph,
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
25
    errors,
0.200.132 by Jelmer Vernooij
Use parents cache, don't set author revision property if it's equal to committer.
26
    graph,
0.200.38 by David Allouche
Reimplement GitRepository.get_inventory, simpler and faster.
27
    inventory,
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
28
    osutils,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
29
    repository,
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
30
    revision,
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
31
    revisiontree,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
32
    urlutils,
0.200.60 by Jelmer Vernooij
Support signature functions.
33
    versionedfile,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
34
    )
0.200.115 by Jelmer Vernooij
Pass mapping object.
35
from bzrlib.foreign import (
0.200.136 by Jelmer Vernooij
Merge new bzr-foreign.
36
        ForeignRepository,
0.200.115 by Jelmer Vernooij
Pass mapping object.
37
        )
0.200.132 by Jelmer Vernooij
Use parents cache, don't set author revision property if it's equal to committer.
38
from bzrlib.trace import mutter
0.200.45 by David Allouche
More performance hacking, introduce sqlite cache, escape characters in commits that break serializers.
39
from bzrlib.transport import get_transport
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
40
0.209.1 by Ali Sabil
Fixed wrong import for versionedfiles in repository.py
41
from bzrlib.plugins.git.foreign import (
0.208.5 by Jelmer Vernooij
Add log show function for git.
42
    versionedfiles,
0.200.20 by John Arbash Meinel
All tests are passing again
43
    )
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
44
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
45
0.200.193 by Jelmer Vernooij
Cope with newer *system* dulwich
46
import dulwich as git
0.200.123 by Jelmer Vernooij
Use central git module.
47
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
48
0.200.120 by Jelmer Vernooij
Use API closer to that of python-git.
49
class GitTags(object):
50
51
    def __init__(self, tags):
52
        self._tags = tags
53
54
    def __iter__(self):
55
        return iter(self._tags)
56
57
0.200.115 by Jelmer Vernooij
Pass mapping object.
58
class GitRepository(ForeignRepository):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
59
    """An adapter to git repositories for bzr."""
60
0.200.41 by David Allouche
Define _serializer = None in GitRepository.
61
    _serializer = None
62
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
63
    def __init__(self, gitdir, lockfiles):
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
64
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
65
        from bzrlib.plugins.git import fetch
66
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
67
        repository.InterRepository.register_optimiser(fetch.InterGitNonGitRepository)
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
68
69
    def is_shared(self):
70
        return True
71
72
    def supports_rich_root(self):
73
        return True
74
75
    def _warn_if_deprecated(self):
76
        # This class isn't deprecated
77
        pass
78
79
    def get_mapping(self):
80
        return default_mapping
81
0.200.147 by Jelmer Vernooij
Merge new dulwich; fetching objects from local repository works now; they aren't converted yet though.
82
    def make_working_trees(self):
83
        return True
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
84
85
86
class LocalGitRepository(GitRepository):
87
88
    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.
89
        # FIXME: This also caches negatives. Need to be more careful 
90
        # about this once we start writing to git
91
        self._parents_provider = graph.CachingParentsProvider(self)
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
92
        GitRepository.__init__(self, gitdir, lockfiles)
0.200.61 by Jelmer Vernooij
Fix tests.
93
        self.base = gitdir.root_transport.base
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
94
        self._git = gitdir._git
0.200.56 by Jelmer Vernooij
Switch to using GitPython rather than our own in-house stuff.
95
        self.texts = None
0.200.92 by Jelmer Vernooij
Update versionedfiles.
96
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
0.200.120 by Jelmer Vernooij
Use API closer to that of python-git.
98
        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.
99
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
100
    def all_revision_ids(self):
101
        ret = set([revision.NULL_REVISION])
102
        if self._git.heads() == []:
103
            return ret
104
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
105
        ret = set(bzr_heads)
106
        graph = self.get_graph()
107
        for rev, parents in graph.iter_ancestry(bzr_heads):
108
            ret.add(rev)
0.200.74 by Jelmer Vernooij
Implement Repository.all_revision_ids().
109
        return ret
110
0.200.82 by Jelmer Vernooij
Support listing tags.
111
    #def get_revision_delta(self, revision_id):
112
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
113
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
114
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
115
0.200.132 by Jelmer Vernooij
Use parents cache, don't set author revision property if it's equal to committer.
116
    def _make_parents_provider(self):
117
        """See Repository._make_parents_provider()."""
118
        return self._parents_provider
119
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
120
    def get_parent_map(self, revids):
121
        parent_map = {}
0.200.132 by Jelmer Vernooij
Use parents cache, don't set author revision property if it's equal to committer.
122
        mutter("get_parent_map(%r)", revids)
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
123
        for revision_id in revids:
124
            assert isinstance(revision_id, str)
125
            if revision_id == revision.NULL_REVISION:
126
                parent_map[revision_id] = ()
127
                continue
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
128
            hexsha, mapping = self.lookup_git_revid(revision_id)
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
129
            commit  = self._git.commit(hexsha)
130
            if commit is None:
131
                continue
132
            else:
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
133
                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.
134
        return parent_map
135
136
    def get_ancestry(self, revision_id, topo_sorted=True):
137
        """See Repository.get_ancestry().
138
        """
139
        if revision_id is None:
140
            return self._all_revision_ids()
141
        assert isinstance(revision_id, str)
142
        ancestry = []
143
        graph = self.get_graph()
144
        for rev, parents in graph.iter_ancestry([revision_id]):
145
            if rev == revision.NULL_REVISION:
146
                rev = None
147
            ancestry.append(rev)
148
        ancestry.reverse()
149
        return ancestry
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
150
151
    def get_signature_text(self, revision_id):
152
        raise errors.NoSuchRevision(self, revision_id)
153
0.200.124 by Jelmer Vernooij
Add lookup_revision_id stub.
154
    def lookup_revision_id(self, revid):
155
        """Lookup a revision id.
156
        
157
        :param revid: Bazaar revision id.
158
        :return: Tuple with git revisionid and mapping.
159
        """
160
        # Yes, this doesn't really work, but good enough as a stub
161
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
162
0.200.60 by Jelmer Vernooij
Support signature functions.
163
    def has_signature_for_revision_id(self, revision_id):
164
        return False
165
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
166
    def lookup_git_revid(self, bzr_revid):
0.200.105 by Jelmer Vernooij
Add common function for finding git commit by bzr revid.
167
        try:
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
168
            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.
169
        except errors.InvalidRevisionId:
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
170
            raise errors.NoSuchRevision(self, bzr_revid)
0.200.105 by Jelmer Vernooij
Add common function for finding git commit by bzr revid.
171
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
172
    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.
173
        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.
174
        try:
175
            commit = self._git.commit(git_commit_id)
176
        except KeyError:
177
            raise errors.NoSuchRevision(self, revision_id)
0.204.5 by James Westby
Lose the debuggin prints.
178
        # 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.
179
        revision = mapping.import_commit(commit)
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
180
        assert revision is not None
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
181
        return revision
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
182
183
    def has_revision(self, revision_id):
184
        try:
185
            self.get_revision(revision_id)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
186
        except errors.NoSuchRevision:
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
187
            return False
188
        else:
189
            return True
190
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
191
    def get_revisions(self, revids):
0.200.134 by Jelmer Vernooij
Fix get_revisions().
192
        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.
193
194
    def revision_trees(self, revids):
195
        for revid in revids:
196
            yield self.revision_tree(revid)
197
198
    def revision_tree(self, revision_id):
0.200.57 by Jelmer Vernooij
Fix more tests.
199
        revision_id = revision.ensure_null(revision_id)
200
201
        if revision_id == revision.NULL_REVISION:
202
            inv = inventory.Inventory(root_id=None)
203
            inv.revision_id = revision_id
204
            return revisiontree.RevisionTree(self, inv, revision_id)
205
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
206
        return GitRevisionTree(self, revision_id)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
207
208
    def get_inventory(self, revision_id):
0.200.57 by Jelmer Vernooij
Fix more tests.
209
        assert revision_id != None
210
        return self.revision_tree(revision_id).inventory
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
211
0.200.108 by Jelmer Vernooij
Support bzr init --git.
212
    def set_make_working_trees(self, trees):
213
        pass
214
0.200.146 by Jelmer Vernooij
Merge dulwich.
215
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
216
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
217
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
218
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
219
class GitRevisionTree(revisiontree.RevisionTree):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
220
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
221
    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.
222
        self._repository = repository
0.200.58 by Jelmer Vernooij
Fix remaining tests.
223
        self.revision_id = revision_id
0.200.149 by Jelmer Vernooij
Raise proper NoSuchRevision exception.
224
        assert isinstance(revision_id, str)
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
225
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
0.200.149 by Jelmer Vernooij
Raise proper NoSuchRevision exception.
226
        try:
0.200.153 by Jelmer Vernooij
Merge new dulwich.
227
            commit = repository._git.commit(git_id)
228
        except KeyError, r:
0.200.149 by Jelmer Vernooij
Raise proper NoSuchRevision exception.
229
            raise errors.NoSuchRevision(repository, revision_id)
0.200.153 by Jelmer Vernooij
Merge new dulwich.
230
        self.tree = commit.tree
0.200.58 by Jelmer Vernooij
Fix remaining tests.
231
        self._inventory = inventory.Inventory(revision_id=revision_id)
232
        self._inventory.root.revision = revision_id
233
        self._build_inventory(self.tree, self._inventory.root, "")
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
234
0.200.79 by Jelmer Vernooij
Implement RevisionTree.get_revision_id().
235
    def get_revision_id(self):
236
        return self.revision_id
237
0.200.87 by Jelmer Vernooij
Remove cache usage.
238
    def get_file_text(self, file_id):
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
239
        entry = self._inventory[file_id]
0.200.87 by Jelmer Vernooij
Remove cache usage.
240
        if entry.kind == 'directory': return ""
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
241
        return self._repository._git.get_blob(entry.text_id).data
0.203.1 by Aaron Bentley
Make checkouts work
242
0.200.129 by Jelmer Vernooij
merge dulwich.
243
    def _build_inventory(self, tree_id, ie, path):
0.200.58 by Jelmer Vernooij
Fix remaining tests.
244
        assert isinstance(path, str)
0.216.3 by Jelmer Vernooij
Fix tree.
245
        tree = self._repository._git.tree(tree_id)
0.200.129 by Jelmer Vernooij
merge dulwich.
246
        for mode, name, hexsha in tree.entries():
0.200.128 by Jelmer Vernooij
Merge new dulwich.
247
            basename = name.decode("utf-8")
0.200.58 by Jelmer Vernooij
Fix remaining tests.
248
            if path == "":
0.200.128 by Jelmer Vernooij
Merge new dulwich.
249
                child_path = name
0.200.58 by Jelmer Vernooij
Fix remaining tests.
250
            else:
0.200.128 by Jelmer Vernooij
Merge new dulwich.
251
                child_path = urlutils.join(path, name)
0.200.152 by Jelmer Vernooij
Fix syntax errors.
252
            file_id = self.mapping.generate_file_id(child_path)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
253
            entry_kind = (mode & 0700000) / 0100000
254
            if entry_kind == 0:
0.200.58 by Jelmer Vernooij
Fix remaining tests.
255
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
256
            elif entry_kind == 1:
257
                file_kind = (mode & 070000) / 010000
258
                b = self._repository._git.get_blob(hexsha)
259
                if file_kind == 0:
0.200.58 by Jelmer Vernooij
Fix remaining tests.
260
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
261
                    child_ie.text_sha1 = osutils.sha_string(b.data)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
262
                elif file_kind == 2:
0.200.58 by Jelmer Vernooij
Fix remaining tests.
263
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
264
                    child_ie.text_sha1 = osutils.sha_string("")
265
                else:
266
                    raise AssertionError(
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
267
                        "Unknown file kind, perms=%o." % (mode,))
0.200.88 by Jelmer Vernooij
Fix RevisionTree.get_file_text().
268
                child_ie.text_id = b.id
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
269
                child_ie.text_size = len(b.data)
0.200.58 by Jelmer Vernooij
Fix remaining tests.
270
            else:
271
                raise AssertionError(
0.200.128 by Jelmer Vernooij
Merge new dulwich.
272
                    "Unknown blob kind, perms=%r." % (mode,))
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
273
            fs_mode = mode & 0777
274
            child_ie.executable = bool(fs_mode & 0111)
0.200.58 by Jelmer Vernooij
Fix remaining tests.
275
            child_ie.revision = self.revision_id
0.200.88 by Jelmer Vernooij
Fix RevisionTree.get_file_text().
276
            self._inventory.add(child_ie)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
277
            if entry_kind == 0:
278
                self._build_inventory(hexsha, child_ie, child_path)
0.200.58 by Jelmer Vernooij
Fix remaining tests.
279
0.203.1 by Aaron Bentley
Make checkouts work
280
281
class GitFormat(object):
282
283
    supports_tree_reference = False
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
284
    rich_root_data = True
0.200.71 by Jelmer Vernooij
Implement GitRepositoryFormat.get_format_description.
285
286
    def get_format_description(self):
287
        return "Git Repository"
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
288
289
    def initialize(self, url, shared=False, _internal=False):
290
        raise bzr_errors.UninitializableFormat(self)
291
292
    def check_conversion_target(self, target_repo_format):
293
        return target_repo_format.rich_root_data