/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.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
24
    errors,
0.200.132 by Jelmer Vernooij
Use parents cache, don't set author revision property if it's equal to committer.
25
    graph,
0.200.38 by David Allouche
Reimplement GitRepository.get_inventory, simpler and faster.
26
    inventory,
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
27
    osutils,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
28
    repository,
0.200.29 by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes.
29
    revision,
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
30
    revisiontree,
0.200.211 by Jelmer Vernooij
Add basic infrastructure for dpush.
31
    ui,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
32
    urlutils,
33
    )
0.200.115 by Jelmer Vernooij
Pass mapping object.
34
from bzrlib.foreign import (
0.200.136 by Jelmer Vernooij
Merge new bzr-foreign.
35
        ForeignRepository,
0.200.115 by Jelmer Vernooij
Pass mapping object.
36
        )
0.200.132 by Jelmer Vernooij
Use parents cache, don't set author revision property if it's equal to committer.
37
from bzrlib.trace import mutter
0.200.45 by David Allouche
More performance hacking, introduce sqlite cache, escape characters in commits that break serializers.
38
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.
39
0.209.1 by Ali Sabil
Fixed wrong import for versionedfiles in repository.py
40
from bzrlib.plugins.git.foreign import (
0.208.5 by Jelmer Vernooij
Add log show function for git.
41
    versionedfiles,
0.200.20 by John Arbash Meinel
All tests are passing again
42
    )
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
43
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry
0.200.208 by Jelmer Vernooij
Add dummy Repository.texts.
44
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.
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.207 by Jelmer Vernooij
Provide Repository.inventories.
98
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
0.200.209 by Jelmer Vernooij
Pass repository object to versionedfiles.
99
        self.texts = GitTexts(self)
0.200.120 by Jelmer Vernooij
Use API closer to that of python-git.
100
        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.
101
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
102
    def all_revision_ids(self):
103
        ret = set([revision.NULL_REVISION])
104
        if self._git.heads() == []:
105
            return ret
106
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
107
        ret = set(bzr_heads)
108
        graph = self.get_graph()
109
        for rev, parents in graph.iter_ancestry(bzr_heads):
110
            ret.add(rev)
0.200.74 by Jelmer Vernooij
Implement Repository.all_revision_ids().
111
        return ret
112
0.200.82 by Jelmer Vernooij
Support listing tags.
113
    #def get_revision_delta(self, revision_id):
114
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
115
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
116
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
117
0.200.132 by Jelmer Vernooij
Use parents cache, don't set author revision property if it's equal to committer.
118
    def _make_parents_provider(self):
119
        """See Repository._make_parents_provider()."""
120
        return self._parents_provider
121
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
122
    def get_parent_map(self, revids):
123
        parent_map = {}
0.200.132 by Jelmer Vernooij
Use parents cache, don't set author revision property if it's equal to committer.
124
        mutter("get_parent_map(%r)", revids)
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
125
        for revision_id in revids:
126
            assert isinstance(revision_id, str)
127
            if revision_id == revision.NULL_REVISION:
128
                parent_map[revision_id] = ()
129
                continue
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
130
            hexsha, mapping = self.lookup_git_revid(revision_id)
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
131
            commit  = self._git.commit(hexsha)
132
            if commit is None:
133
                continue
134
            else:
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
135
                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.
136
        return parent_map
137
138
    def get_ancestry(self, revision_id, topo_sorted=True):
139
        """See Repository.get_ancestry().
140
        """
141
        if revision_id is None:
142
            return self._all_revision_ids()
143
        assert isinstance(revision_id, str)
144
        ancestry = []
145
        graph = self.get_graph()
146
        for rev, parents in graph.iter_ancestry([revision_id]):
147
            if rev == revision.NULL_REVISION:
148
                rev = None
149
            ancestry.append(rev)
150
        ancestry.reverse()
151
        return ancestry
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
152
0.200.211 by Jelmer Vernooij
Add basic infrastructure for dpush.
153
    def import_revision_gist(self, source, revid):
154
        pass
155
156
    def dfetch(self, source, stop_revision):
157
        if stop_revision is None:
158
            raise NotImplementedError
159
        revidmap = {}
160
        todo = []
161
        source.lock_read()
162
        try:
163
            graph = source.get_graph()
164
            for revid, parents in graph.iter_ancestry([stop_revision]):
165
                if not self.has_revision(revid):
166
                    todo.append(revid)
167
            pb = ui.ui_factory.nested_progress_bar()
168
            try:
169
                for i, revid in enumerate(reversed(todo)):
170
                    pb.update("pushing revisions", i, len(todo))
171
                    revidmap[revid] = self.import_revision_gist(source, revid)
172
            finally:
173
                pb.finished()
174
        finally:
175
            source.unlock()
176
        return revidmap
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
228
        if revision_id == revision.NULL_REVISION:
229
            inv = inventory.Inventory(root_id=None)
230
            inv.revision_id = revision_id
231
            return revisiontree.RevisionTree(self, inv, revision_id)
232
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
233
        return GitRevisionTree(self, revision_id)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
234
235
    def get_inventory(self, revision_id):
0.200.57 by Jelmer Vernooij
Fix more tests.
236
        assert revision_id != None
237
        return self.revision_tree(revision_id).inventory
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
238
0.200.108 by Jelmer Vernooij
Support bzr init --git.
239
    def set_make_working_trees(self, trees):
240
        pass
241
0.200.146 by Jelmer Vernooij
Merge dulwich.
242
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
243
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
244
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
245
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
246
class GitRevisionTree(revisiontree.RevisionTree):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
247
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
248
    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.
249
        self._repository = repository
0.200.58 by Jelmer Vernooij
Fix remaining tests.
250
        self.revision_id = revision_id
0.200.149 by Jelmer Vernooij
Raise proper NoSuchRevision exception.
251
        assert isinstance(revision_id, str)
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
252
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
0.200.149 by Jelmer Vernooij
Raise proper NoSuchRevision exception.
253
        try:
0.200.153 by Jelmer Vernooij
Merge new dulwich.
254
            commit = repository._git.commit(git_id)
255
        except KeyError, r:
0.200.149 by Jelmer Vernooij
Raise proper NoSuchRevision exception.
256
            raise errors.NoSuchRevision(repository, revision_id)
0.200.153 by Jelmer Vernooij
Merge new dulwich.
257
        self.tree = commit.tree
0.200.58 by Jelmer Vernooij
Fix remaining tests.
258
        self._inventory = inventory.Inventory(revision_id=revision_id)
259
        self._inventory.root.revision = revision_id
260
        self._build_inventory(self.tree, self._inventory.root, "")
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
261
0.200.79 by Jelmer Vernooij
Implement RevisionTree.get_revision_id().
262
    def get_revision_id(self):
263
        return self.revision_id
264
0.200.87 by Jelmer Vernooij
Remove cache usage.
265
    def get_file_text(self, file_id):
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
266
        entry = self._inventory[file_id]
0.200.87 by Jelmer Vernooij
Remove cache usage.
267
        if entry.kind == 'directory': return ""
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
268
        return self._repository._git.get_blob(entry.text_id).data
0.203.1 by Aaron Bentley
Make checkouts work
269
0.200.129 by Jelmer Vernooij
merge dulwich.
270
    def _build_inventory(self, tree_id, ie, path):
0.200.58 by Jelmer Vernooij
Fix remaining tests.
271
        assert isinstance(path, str)
0.216.3 by Jelmer Vernooij
Fix tree.
272
        tree = self._repository._git.tree(tree_id)
0.200.129 by Jelmer Vernooij
merge dulwich.
273
        for mode, name, hexsha in tree.entries():
0.200.128 by Jelmer Vernooij
Merge new dulwich.
274
            basename = name.decode("utf-8")
0.200.58 by Jelmer Vernooij
Fix remaining tests.
275
            if path == "":
0.200.128 by Jelmer Vernooij
Merge new dulwich.
276
                child_path = name
0.200.58 by Jelmer Vernooij
Fix remaining tests.
277
            else:
0.200.128 by Jelmer Vernooij
Merge new dulwich.
278
                child_path = urlutils.join(path, name)
0.200.152 by Jelmer Vernooij
Fix syntax errors.
279
            file_id = self.mapping.generate_file_id(child_path)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
280
            entry_kind = (mode & 0700000) / 0100000
281
            if entry_kind == 0:
0.200.58 by Jelmer Vernooij
Fix remaining tests.
282
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
283
            elif entry_kind == 1:
284
                file_kind = (mode & 070000) / 010000
285
                b = self._repository._git.get_blob(hexsha)
286
                if file_kind == 0:
0.200.58 by Jelmer Vernooij
Fix remaining tests.
287
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
288
                    child_ie.text_sha1 = osutils.sha_string(b.data)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
289
                elif file_kind == 2:
0.200.58 by Jelmer Vernooij
Fix remaining tests.
290
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
291
                    child_ie.text_sha1 = osutils.sha_string("")
292
                else:
293
                    raise AssertionError(
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
294
                        "Unknown file kind, perms=%o." % (mode,))
0.200.88 by Jelmer Vernooij
Fix RevisionTree.get_file_text().
295
                child_ie.text_id = b.id
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
296
                child_ie.text_size = len(b.data)
0.200.58 by Jelmer Vernooij
Fix remaining tests.
297
            else:
298
                raise AssertionError(
0.200.128 by Jelmer Vernooij
Merge new dulwich.
299
                    "Unknown blob kind, perms=%r." % (mode,))
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
300
            fs_mode = mode & 0777
301
            child_ie.executable = bool(fs_mode & 0111)
0.200.58 by Jelmer Vernooij
Fix remaining tests.
302
            child_ie.revision = self.revision_id
0.200.88 by Jelmer Vernooij
Fix RevisionTree.get_file_text().
303
            self._inventory.add(child_ie)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
304
            if entry_kind == 0:
305
                self._build_inventory(hexsha, child_ie, child_path)
0.200.58 by Jelmer Vernooij
Fix remaining tests.
306
0.203.1 by Aaron Bentley
Make checkouts work
307
308
class GitFormat(object):
309
310
    supports_tree_reference = False
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
311
    rich_root_data = True
0.200.71 by Jelmer Vernooij
Implement GitRepositoryFormat.get_format_description.
312
313
    def get_format_description(self):
314
        return "Git Repository"
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
315
316
    def initialize(self, url, shared=False, _internal=False):
317
        raise bzr_errors.UninitializableFormat(self)
318
319
    def check_conversion_target(self, target_repo_format):
320
        return target_repo_format.rich_root_data