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