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