/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to repository.py

Create cache dir if it doesn't exist yet.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
1
1
# Copyright (C) 2007 Canonical Ltd
 
2
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
16
17
 
17
18
"""An adapter between a Git Repository and a Bazaar Branch"""
18
19
 
19
 
import os
20
 
import time
21
 
 
22
20
import bzrlib
23
21
from bzrlib import (
24
 
    deprecated_graph,
25
22
    errors,
 
23
    graph,
26
24
    inventory,
27
25
    osutils,
28
26
    repository,
29
27
    revision,
30
28
    revisiontree,
 
29
    ui,
31
30
    urlutils,
32
 
    versionedfile,
33
31
    )
34
32
from bzrlib.foreign import (
35
 
        ForeignRevision,
36
 
        )
37
 
from bzrlib.transport import get_transport
38
 
 
39
 
from bzrlib.plugins.git.foreign import (
40
33
    ForeignRepository,
41
 
    versionedfiles,
42
 
    )
43
 
from bzrlib.plugins.git.mapping import default_mapping
44
 
 
45
 
from bzrlib.plugins.git import git
46
 
 
47
 
 
48
 
class GitTags(object):
49
 
 
50
 
    def __init__(self, tags):
51
 
        self._tags = tags
52
 
 
53
 
    def __iter__(self):
54
 
        return iter(self._tags)
 
34
    )
 
35
from bzrlib.trace import (
 
36
    mutter,
 
37
    )
 
38
from bzrlib.transport import (
 
39
    get_transport,
 
40
    )
 
41
 
 
42
from bzrlib.plugins.git.commit import (
 
43
    GitCommitBuilder,
 
44
    )
 
45
from bzrlib.plugins.git.inventory import (
 
46
    GitInventory,
 
47
    )
 
48
from bzrlib.plugins.git.mapping import (
 
49
    default_mapping,
 
50
    foreign_git,
 
51
    mapping_registry,
 
52
    )
 
53
from bzrlib.plugins.git.versionedfiles import (
 
54
    GitRevisions,
 
55
    GitTexts,
 
56
    )
55
57
 
56
58
 
57
59
class GitRepository(ForeignRepository):
58
60
    """An adapter to git repositories for bzr."""
59
61
 
60
62
    _serializer = None
61
 
 
62
 
    def __init__(self, gitdir, lockfiles):
 
63
    _commit_builder_class = GitCommitBuilder
 
64
    vcs = foreign_git
 
65
 
 
66
    def __init__(self, gitdir, lockfiles):
 
67
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
 
68
            lockfiles)
 
69
        from bzrlib.plugins.git import fetch, push
 
70
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
 
71
                          fetch.InterLocalGitNonGitRepository,
 
72
                          fetch.InterGitGitRepository,
 
73
                          push.InterToLocalGitRepository,
 
74
                          push.InterToRemoteGitRepository]:
 
75
            repository.InterRepository.register_optimiser(optimiser)
 
76
 
 
77
    def is_shared(self):
 
78
        return True
 
79
 
 
80
    def supports_rich_root(self):
 
81
        return True
 
82
 
 
83
    def _warn_if_deprecated(self):
 
84
        # This class isn't deprecated
 
85
        pass
 
86
 
 
87
    def get_mapping(self):
 
88
        return default_mapping
 
89
 
 
90
    def make_working_trees(self):
 
91
        return True
 
92
 
 
93
    def revision_graph_can_have_wrong_parents(self):
 
94
        return False
 
95
 
 
96
    def dfetch(self, source, stop_revision):
 
97
        interrepo = repository.InterRepository.get(source, self)
 
98
        return interrepo.dfetch(stop_revision)
 
99
 
 
100
    def dfetch_refs(self, source, stop_revision):
 
101
        interrepo = repository.InterRepository.get(source, self)
 
102
        return interrepo.dfetch_refs(stop_revision)
 
103
 
 
104
 
 
105
class LocalGitRepository(GitRepository):
 
106
    """Git repository on the file system."""
 
107
 
 
108
    def __init__(self, gitdir, lockfiles):
 
109
        # FIXME: This also caches negatives. Need to be more careful 
 
110
        # about this once we start writing to git
 
111
        self._parents_provider = graph.CachingParentsProvider(self)
 
112
        GitRepository.__init__(self, gitdir, lockfiles)
63
113
        self.base = gitdir.root_transport.base
64
 
        self.bzrdir = gitdir
65
 
        self.control_files = lockfiles
66
114
        self._git = gitdir._git
67
115
        self.texts = None
68
 
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
69
 
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
70
 
        self._format = GitFormat()
71
 
        self._fallback_repositories = []
72
 
        self.tags = GitTags(self._git.get_tags())
 
116
        self.signatures = None
 
117
        self.revisions = GitRevisions(self._git.object_store)
 
118
        self.inventories = None
 
119
        self.texts = GitTexts(self)
73
120
 
74
 
    def _all_revision_ids(self):
75
 
        if self._git.heads == []:
76
 
            return set()
77
 
        ret = set()
78
 
        skip = 0
79
 
        max_count = 1000
80
 
        cms = None
81
 
        while cms != []:
82
 
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
83
 
            skip += max_count
84
 
            ret.update([self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms])
 
121
    def all_revision_ids(self):
 
122
        ret = set([revision.NULL_REVISION])
 
123
        heads = self._git.refs.as_dict('refs/heads')
 
124
        if heads == {}:
 
125
            return ret
 
126
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
 
127
        ret = set(bzr_heads)
 
128
        graph = self.get_graph()
 
129
        for rev, parents in graph.iter_ancestry(bzr_heads):
 
130
            ret.add(rev)
85
131
        return ret
86
132
 
87
 
    def is_shared(self):
88
 
        return True
89
 
 
90
 
    def supports_rich_root(self):
91
 
        return False
92
 
 
93
 
    #def get_revision_delta(self, revision_id):
94
 
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
95
 
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
96
 
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
97
 
 
98
 
    def get_ancestry(self, revision_id):
99
 
        revision_id = revision.ensure_null(revision_id)
100
 
        ret = []
101
 
        if revision_id != revision.NULL_REVISION:
102
 
            skip = 0
103
 
            max_count = 1000
104
 
            cms = None
105
 
            while cms != []:
106
 
                cms = self._git.commits(self.lookup_git_revid(revision_id, self.get_mapping()), max_count=max_count, skip=skip)
107
 
                skip += max_count
108
 
                ret += [self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms]
109
 
        return [None] + ret
 
133
    def _make_parents_provider(self):
 
134
        """See Repository._make_parents_provider()."""
 
135
        return self._parents_provider
 
136
 
 
137
    def get_parent_map(self, revids):
 
138
        parent_map = {}
 
139
        for revision_id in revids:
 
140
            assert isinstance(revision_id, str)
 
141
            if revision_id == revision.NULL_REVISION:
 
142
                parent_map[revision_id] = ()
 
143
                continue
 
144
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
145
            commit  = self._git.commit(hexsha)
 
146
            if commit is None:
 
147
                continue
 
148
            else:
 
149
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
150
        return parent_map
 
151
 
 
152
    def get_ancestry(self, revision_id, topo_sorted=True):
 
153
        """See Repository.get_ancestry().
 
154
        """
 
155
        if revision_id is None:
 
156
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
157
        assert isinstance(revision_id, str)
 
158
        ancestry = []
 
159
        graph = self.get_graph()
 
160
        for rev, parents in graph.iter_ancestry([revision_id]):
 
161
            ancestry.append(rev)
 
162
        ancestry.reverse()
 
163
        return [None] + ancestry
110
164
 
111
165
    def get_signature_text(self, revision_id):
112
166
        raise errors.NoSuchRevision(self, revision_id)
123
177
    def has_signature_for_revision_id(self, revision_id):
124
178
        return False
125
179
 
126
 
    def get_mapping(self):
127
 
        return default_mapping
128
 
 
129
 
    def get_parent_map(self, revision_ids):
130
 
        ret = {}
131
 
        for revid in revision_ids:
132
 
            if revid == revision.NULL_REVISION:
133
 
                ret[revid] = ()
134
 
            else:
135
 
                git_commit_id = self.lookup_git_revid(revid, self.get_mapping())
136
 
                commit = self._git.commit(git_commit_id)
137
 
                ret[revid] = tuple([self.get_mapping().revision_id_foreign_to_bzr(p.id) for p in commit.parents])
138
 
        return ret
139
 
 
140
 
    def lookup_git_revid(self, bzr_revid, mapping):
 
180
    def lookup_git_revid(self, bzr_revid):
141
181
        try:
142
 
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
182
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
143
183
        except errors.InvalidRevisionId:
144
 
            raise errors.NoSuchRevision(bzr_revid, self)
 
184
            raise errors.NoSuchRevision(self, bzr_revid)
145
185
 
146
186
    def get_revision(self, revision_id):
147
 
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
148
 
        commit = self._git.commit(git_commit_id)
 
187
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
188
        try:
 
189
            commit = self._git.commit(git_commit_id)
 
190
        except KeyError:
 
191
            raise errors.NoSuchRevision(self, revision_id)
149
192
        # print "fetched revision:", git_commit_id
150
 
        revision = self._parse_rev(commit, self.get_mapping())
 
193
        revision = mapping.import_commit(commit)
 
194
        assert revision is not None
151
195
        return revision
152
196
 
153
197
    def has_revision(self, revision_id):
154
198
        try:
155
199
            self.get_revision(revision_id)
156
 
        except NoSuchRevision:
 
200
        except errors.NoSuchRevision:
157
201
            return False
158
202
        else:
159
203
            return True
160
204
 
161
 
    def get_revisions(self, revisions):
162
 
        return [self.get_revision(r) for r in revisions]
163
 
 
164
 
    @classmethod
165
 
    def _parse_rev(klass, commit, mapping):
166
 
        """Convert a git commit to a bzr revision.
167
 
 
168
 
        :return: a `bzrlib.revision.Revision` object.
169
 
        """
170
 
        if commit is None:
171
 
            raise AssertionError("Commit object can't be None")
172
 
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
173
 
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
174
 
        rev.message = commit.message.decode("utf-8", "replace")
175
 
        rev.committer = str(commit.committer).decode("utf-8", "replace")
176
 
        rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
177
 
        rev.timestamp = time.mktime(commit.committed_date)
178
 
        rev.timezone = 0
179
 
        return rev
 
205
    def get_revisions(self, revids):
 
206
        return [self.get_revision(r) for r in revids]
180
207
 
181
208
    def revision_trees(self, revids):
182
209
        for revid in revids:
184
211
 
185
212
    def revision_tree(self, revision_id):
186
213
        revision_id = revision.ensure_null(revision_id)
187
 
 
188
214
        if revision_id == revision.NULL_REVISION:
189
215
            inv = inventory.Inventory(root_id=None)
190
216
            inv.revision_id = revision_id
191
217
            return revisiontree.RevisionTree(self, inv, revision_id)
192
 
 
193
218
        return GitRevisionTree(self, revision_id)
194
219
 
195
220
    def get_inventory(self, revision_id):
199
224
    def set_make_working_trees(self, trees):
200
225
        pass
201
226
 
202
 
 
203
 
def escape_file_id(file_id):
204
 
    return file_id.replace('_', '__').replace(' ', '_s')
205
 
 
206
 
 
207
 
def unescape_file_id(file_id):
208
 
    return file_id.replace("_s", " ").replace("__", "_")
 
227
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
228
        progress=None):
 
229
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
209
230
 
210
231
 
211
232
class GitRevisionTree(revisiontree.RevisionTree):
212
233
 
213
234
    def __init__(self, repository, revision_id):
 
235
        self._revision_id = revision_id
214
236
        self._repository = repository
215
 
        self.revision_id = revision_id
216
 
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
217
 
        self.tree = repository._git.commit(git_id).tree
218
 
        self._inventory = inventory.Inventory(revision_id=revision_id)
219
 
        self._inventory.root.revision = revision_id
220
 
        self._build_inventory(self.tree, self._inventory.root, "")
 
237
        store = repository._git.object_store
 
238
        assert isinstance(revision_id, str)
 
239
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
 
240
        try:
 
241
            commit = store[git_id]
 
242
        except KeyError, r:
 
243
            raise errors.NoSuchRevision(repository, revision_id)
 
244
        self.tree = commit.tree
 
245
        self._inventory = GitInventory(self.tree, self.mapping, store, 
 
246
                                       revision_id)
221
247
 
222
248
    def get_revision_id(self):
223
 
        return self.revision_id
 
249
        return self._revision_id
224
250
 
225
 
    def get_file_text(self, file_id):
226
 
        entry = self._inventory[file_id]
 
251
    def get_file_text(self, file_id, path=None):
 
252
        if path is not None:
 
253
            entry = self._inventory._get_ie(path)
 
254
        else:
 
255
            entry = self._inventory[file_id]
227
256
        if entry.kind == 'directory': return ""
228
 
        return self._repository._git.blob(entry.text_id).data
229
 
 
230
 
    def _build_inventory(self, tree, ie, path):
231
 
        assert isinstance(path, str)
232
 
        for name, mode, hexsha in tree.entries():
233
 
            basename = name.decode("utf-8")
234
 
            if path == "":
235
 
                child_path = name
236
 
            else:
237
 
                child_path = urlutils.join(path, name)
238
 
            file_id = escape_file_id(child_path.encode('utf-8'))
239
 
            if mode[0] == '0':
240
 
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
241
 
            elif mode[0] == '1':
242
 
                if mode[1] == '0':
243
 
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
244
 
                    child_ie.text_sha1 = osutils.sha_string(b.data)
245
 
                elif mode[1] == '2':
246
 
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
247
 
                    child_ie.text_sha1 = osutils.sha_string("")
248
 
                else:
249
 
                    raise AssertionError(
250
 
                        "Unknown file kind, perms=%r." % (mode,))
251
 
                child_ie.text_id = b.id
252
 
                child_ie.text_size = b.size
253
 
            else:
254
 
                raise AssertionError(
255
 
                    "Unknown blob kind, perms=%r." % (mode,))
256
 
            child_ie.executable = bool(int(mode[3:], 8) & 0111)
257
 
            child_ie.revision = self.revision_id
258
 
            self._inventory.add(child_ie)
259
 
            if mode[0] == '0':
260
 
                self._build_inventory(b, child_ie, child_path)
261
 
 
262
 
 
263
 
class GitFormat(object):
 
257
        return entry.object.data
 
258
 
 
259
 
 
260
class GitRepositoryFormat(repository.RepositoryFormat):
 
261
    """Git repository format."""
264
262
 
265
263
    supports_tree_reference = False
 
264
    rich_root_data = True
266
265
 
267
266
    def get_format_description(self):
268
267
        return "Git Repository"
 
268
 
 
269
    def initialize(self, url, shared=False, _internal=False):
 
270
        raise bzr_errors.UninitializableFormat(self)
 
271
 
 
272
    def check_conversion_target(self, target_repo_format):
 
273
        return target_repo_format.rich_root_data
 
274
 
 
275
    def network_name(self):
 
276
        return "git"