/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

Make most tree inspection tests succeed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
23
23
from bzrlib import (
24
24
    deprecated_graph,
25
25
    errors,
26
 
    graph,
27
26
    inventory,
28
27
    osutils,
29
28
    repository,
33
32
    versionedfile,
34
33
    )
35
34
from bzrlib.foreign import (
36
 
        ForeignRepository,
 
35
        ForeignRevision,
37
36
        )
38
 
from bzrlib.trace import mutter
39
37
from bzrlib.transport import get_transport
40
38
 
41
39
from bzrlib.plugins.git.foreign import (
 
40
    ForeignRepository,
42
41
    versionedfiles,
43
42
    )
44
43
from bzrlib.plugins.git.mapping import default_mapping
62
61
 
63
62
    def __init__(self, gitdir, lockfiles):
64
63
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
65
 
        from bzrlib.plugins.git import fetch
66
 
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
67
 
 
68
 
    def is_shared(self):
69
 
        return True
70
 
 
71
 
    def supports_rich_root(self):
72
 
        return True
73
 
 
74
 
    def _warn_if_deprecated(self):
75
 
        # This class isn't deprecated
76
 
        pass
77
 
 
78
 
    def get_mapping(self):
79
 
        return default_mapping
80
 
 
81
 
    def make_working_trees(self):
82
 
        return True
83
 
 
84
 
 
85
 
class LocalGitRepository(GitRepository):
86
 
 
87
 
    def __init__(self, gitdir, lockfiles):
88
 
        # FIXME: This also caches negatives. Need to be more careful 
89
 
        # about this once we start writing to git
90
 
        self._parents_provider = graph.CachingParentsProvider(self)
91
 
        GitRepository.__init__(self, gitdir, lockfiles)
92
64
        self.base = gitdir.root_transport.base
 
65
        self.bzrdir = gitdir
93
66
        self._git = gitdir._git
94
67
        self.texts = None
95
68
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
96
69
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
97
70
        self.tags = GitTags(self._git.get_tags())
98
71
 
99
 
    def all_revision_ids(self):
100
 
        ret = set([revision.NULL_REVISION])
101
 
        if self._git.heads() == []:
102
 
            return ret
103
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
104
 
        ret = set(bzr_heads)
105
 
        graph = self.get_graph()
106
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
107
 
            ret.add(rev)
 
72
    def _all_revision_ids(self):
 
73
        if self._git.heads == []:
 
74
            return set()
 
75
        ret = set()
 
76
        skip = 0
 
77
        max_count = 1000
 
78
        cms = None
 
79
        while cms != []:
 
80
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
 
81
            skip += max_count
 
82
            ret.update([self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms])
108
83
        return ret
109
84
 
 
85
    def is_shared(self):
 
86
        return True
 
87
 
 
88
    def supports_rich_root(self):
 
89
        return False
 
90
 
110
91
    #def get_revision_delta(self, revision_id):
111
92
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
112
93
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
113
94
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
114
95
 
115
 
    def _make_parents_provider(self):
116
 
        """See Repository._make_parents_provider()."""
117
 
        return self._parents_provider
118
 
 
119
 
    def get_parent_map(self, revids):
120
 
        parent_map = {}
121
 
        mutter("get_parent_map(%r)", revids)
122
 
        for revision_id in revids:
123
 
            assert isinstance(revision_id, str)
124
 
            if revision_id == revision.NULL_REVISION:
125
 
                parent_map[revision_id] = ()
126
 
                continue
127
 
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
128
 
            commit  = self._git.commit(hexsha)
129
 
            if commit is None:
130
 
                continue
131
 
            else:
132
 
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
133
 
        return parent_map
134
 
 
135
 
    def get_ancestry(self, revision_id, topo_sorted=True):
136
 
        """See Repository.get_ancestry().
137
 
        """
138
 
        if revision_id is None:
139
 
            return self._all_revision_ids()
140
 
        assert isinstance(revision_id, str)
141
 
        ancestry = []
142
 
        graph = self.get_graph()
143
 
        for rev, parents in graph.iter_ancestry([revision_id]):
144
 
            if rev == revision.NULL_REVISION:
145
 
                rev = None
146
 
            ancestry.append(rev)
147
 
        ancestry.reverse()
148
 
        return ancestry
 
96
    def get_ancestry(self, revision_id):
 
97
        revision_id = revision.ensure_null(revision_id)
 
98
        ret = []
 
99
        if revision_id != revision.NULL_REVISION:
 
100
            skip = 0
 
101
            max_count = 1000
 
102
            cms = None
 
103
            while cms != []:
 
104
                cms = self._git.commits(self.lookup_git_revid(revision_id, self.get_mapping()), max_count=max_count, skip=skip)
 
105
                skip += max_count
 
106
                ret += [self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms]
 
107
        return [None] + ret
149
108
 
150
109
    def get_signature_text(self, revision_id):
151
110
        raise errors.NoSuchRevision(self, revision_id)
162
121
    def has_signature_for_revision_id(self, revision_id):
163
122
        return False
164
123
 
 
124
    def get_mapping(self):
 
125
        return default_mapping
 
126
 
 
127
    def get_parent_map(self, revision_ids):
 
128
        ret = {}
 
129
        for revid in revision_ids:
 
130
            if revid == revision.NULL_REVISION:
 
131
                ret[revid] = ()
 
132
            else:
 
133
                git_commit_id = self.lookup_git_revid(revid, self.get_mapping())
 
134
                commit = self._git.commit(git_commit_id)
 
135
                ret[revid] = tuple([self.get_mapping().revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
136
        return ret
 
137
 
165
138
    def lookup_git_revid(self, bzr_revid, mapping):
166
139
        try:
167
140
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
168
141
        except errors.InvalidRevisionId:
169
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
142
            raise errors.NoSuchRevision(bzr_revid, self)
170
143
 
171
144
    def get_revision(self, revision_id):
172
145
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
173
 
        try:
174
 
            commit = self._git.commit(git_commit_id)
175
 
        except KeyError:
176
 
            raise errors.NoSuchRevision(self, revision_id)
 
146
        commit = self._git.commit(git_commit_id)
177
147
        # print "fetched revision:", git_commit_id
178
 
        revision = self.get_mapping().import_commit(commit)
179
 
        assert revision is not None
 
148
        revision = self._parse_rev(commit, self.get_mapping())
180
149
        return revision
181
150
 
182
151
    def has_revision(self, revision_id):
187
156
        else:
188
157
            return True
189
158
 
190
 
    def get_revisions(self, revids):
191
 
        return [self.get_revision(r) for r in revids]
 
159
    def get_revisions(self, revisions):
 
160
        return [self.get_revision(r) for r in revisions]
 
161
 
 
162
    @classmethod
 
163
    def _parse_rev(klass, commit, mapping):
 
164
        """Convert a git commit to a bzr revision.
 
165
 
 
166
        :return: a `bzrlib.revision.Revision` object.
 
167
        """
 
168
        if commit is None:
 
169
            raise AssertionError("Commit object can't be None")
 
170
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
171
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
172
        rev.message = commit.message.decode("utf-8", "replace")
 
173
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
174
        rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
175
        rev.timestamp = commit.commit_time
 
176
        rev.timezone = 0
 
177
        return rev
192
178
 
193
179
    def revision_trees(self, revids):
194
180
        for revid in revids:
202
188
            inv.revision_id = revision_id
203
189
            return revisiontree.RevisionTree(self, inv, revision_id)
204
190
 
205
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
191
        return GitRevisionTree(self, revision_id)
206
192
 
207
193
    def get_inventory(self, revision_id):
208
194
        assert revision_id != None
211
197
    def set_make_working_trees(self, trees):
212
198
        pass
213
199
 
214
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
215
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
200
 
 
201
def escape_file_id(file_id):
 
202
    return file_id.replace('_', '__').replace(' ', '_s')
 
203
 
 
204
 
 
205
def unescape_file_id(file_id):
 
206
    return file_id.replace("_s", " ").replace("__", "_")
216
207
 
217
208
 
218
209
class GitRevisionTree(revisiontree.RevisionTree):
219
210
 
220
 
    def __init__(self, repository, mapping, revision_id):
 
211
    def __init__(self, repository, revision_id):
221
212
        self._repository = repository
222
213
        self.revision_id = revision_id
223
 
        assert isinstance(revision_id, str)
224
 
        self.mapping = mapping
225
 
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
226
 
        try:
227
 
            commit = repository._git.commit(git_id)
228
 
        except KeyError, r:
229
 
            raise errors.NoSuchRevision(repository, revision_id)
230
 
        self.tree = commit.tree
 
214
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
 
215
        self.tree = repository._git.commit(git_id).tree
231
216
        self._inventory = inventory.Inventory(revision_id=revision_id)
232
217
        self._inventory.root.revision = revision_id
233
218
        self._build_inventory(self.tree, self._inventory.root, "")
242
227
 
243
228
    def _build_inventory(self, tree_id, ie, path):
244
229
        assert isinstance(path, str)
245
 
        tree = self._repository._git.tree(tree_id)
 
230
        tree = self._repository._git.get_tree(tree_id)
246
231
        for mode, name, hexsha in tree.entries():
247
232
            basename = name.decode("utf-8")
248
233
            if path == "":
249
234
                child_path = name
250
235
            else:
251
236
                child_path = urlutils.join(path, name)
252
 
            file_id = self.mapping.generate_file_id(child_path)
 
237
            file_id = escape_file_id(child_path.encode('utf-8'))
253
238
            entry_kind = (mode & 0700000) / 0100000
254
239
            if entry_kind == 0:
255
240
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
281
266
class GitFormat(object):
282
267
 
283
268
    supports_tree_reference = False
284
 
    rich_root_data = True
285
269
 
286
270
    def get_format_description(self):
287
271
        return "Git Repository"
288
 
 
289
 
    def initialize(self, url, shared=False, _internal=False):
290
 
        raise bzr_errors.UninitializableFormat(self)
291
 
 
292
 
    def check_conversion_target(self, target_repo_format):
293
 
        return target_repo_format.rich_root_data