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