/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

Cope with newer *system* dulwich

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,
26
27
    inventory,
27
28
    osutils,
28
29
    repository,
32
33
    versionedfile,
33
34
    )
34
35
from bzrlib.foreign import (
35
 
        ForeignRevision,
 
36
        ForeignRepository,
36
37
        )
 
38
from bzrlib.trace import mutter
37
39
from bzrlib.transport import get_transport
38
40
 
39
41
from bzrlib.plugins.git.foreign import (
40
 
    ForeignRepository,
41
42
    versionedfiles,
42
43
    )
43
44
from bzrlib.plugins.git.mapping import default_mapping
44
45
 
45
 
from bzrlib.plugins.git import git
 
46
import dulwich as git
46
47
 
47
48
 
48
49
class GitTags(object):
60
61
    _serializer = None
61
62
 
62
63
    def __init__(self, gitdir, lockfiles):
 
64
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
 
65
        from bzrlib.plugins.git import fetch
 
66
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
 
67
        repository.InterRepository.register_optimiser(fetch.InterGitNonGitRepository)
 
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
    def make_working_trees(self):
 
83
        return True
 
84
 
 
85
 
 
86
class LocalGitRepository(GitRepository):
 
87
 
 
88
    def __init__(self, gitdir, lockfiles):
 
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)
 
92
        GitRepository.__init__(self, gitdir, lockfiles)
63
93
        self.base = gitdir.root_transport.base
64
 
        self.bzrdir = gitdir
65
 
        self.control_files = lockfiles
66
94
        self._git = gitdir._git
67
95
        self.texts = None
68
96
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
69
97
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
70
 
        self._format = GitFormat()
71
 
        self._fallback_repositories = []
72
98
        self.tags = GitTags(self._git.get_tags())
73
99
 
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])
 
100
    def all_revision_ids(self):
 
101
        ret = set([revision.NULL_REVISION])
 
102
        if self._git.heads() == []:
 
103
            return ret
 
104
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
 
105
        ret = set(bzr_heads)
 
106
        graph = self.get_graph()
 
107
        for rev, parents in graph.iter_ancestry(bzr_heads):
 
108
            ret.add(rev)
85
109
        return ret
86
110
 
87
 
    def is_shared(self):
88
 
        return True
89
 
 
90
 
    def supports_rich_root(self):
91
 
        return False
92
 
 
93
111
    #def get_revision_delta(self, revision_id):
94
112
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
95
113
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
96
114
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
97
115
 
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
 
116
    def _make_parents_provider(self):
 
117
        """See Repository._make_parents_provider()."""
 
118
        return self._parents_provider
 
119
 
 
120
    def get_parent_map(self, revids):
 
121
        parent_map = {}
 
122
        mutter("get_parent_map(%r)", revids)
 
123
        for revision_id in revids:
 
124
            assert isinstance(revision_id, str)
 
125
            if revision_id == revision.NULL_REVISION:
 
126
                parent_map[revision_id] = ()
 
127
                continue
 
128
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
 
129
            commit  = self._git.commit(hexsha)
 
130
            if commit is None:
 
131
                continue
 
132
            else:
 
133
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
 
134
        return parent_map
 
135
 
 
136
    def get_ancestry(self, revision_id, topo_sorted=True):
 
137
        """See Repository.get_ancestry().
 
138
        """
 
139
        if revision_id is None:
 
140
            return self._all_revision_ids()
 
141
        assert isinstance(revision_id, str)
 
142
        ancestry = []
 
143
        graph = self.get_graph()
 
144
        for rev, parents in graph.iter_ancestry([revision_id]):
 
145
            if rev == revision.NULL_REVISION:
 
146
                rev = None
 
147
            ancestry.append(rev)
 
148
        ancestry.reverse()
 
149
        return ancestry
110
150
 
111
151
    def get_signature_text(self, revision_id):
112
152
        raise errors.NoSuchRevision(self, revision_id)
123
163
    def has_signature_for_revision_id(self, revision_id):
124
164
        return False
125
165
 
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
166
    def lookup_git_revid(self, bzr_revid, mapping):
141
167
        try:
142
168
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
143
169
        except errors.InvalidRevisionId:
144
 
            raise errors.NoSuchRevision(bzr_revid, self)
 
170
            raise errors.NoSuchRevision(self, bzr_revid)
145
171
 
146
172
    def get_revision(self, revision_id):
147
173
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
148
 
        commit = self._git.commit(git_commit_id)
 
174
        try:
 
175
            commit = self._git.commit(git_commit_id)
 
176
        except KeyError:
 
177
            raise errors.NoSuchRevision(self, revision_id)
149
178
        # print "fetched revision:", git_commit_id
150
 
        revision = self._parse_rev(commit, self.get_mapping())
 
179
        revision = self.get_mapping().import_commit(commit)
 
180
        assert revision is not None
151
181
        return revision
152
182
 
153
183
    def has_revision(self, revision_id):
154
184
        try:
155
185
            self.get_revision(revision_id)
156
 
        except NoSuchRevision:
 
186
        except errors.NoSuchRevision:
157
187
            return False
158
188
        else:
159
189
            return True
160
190
 
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
 
191
    def get_revisions(self, revids):
 
192
        return [self.get_revision(r) for r in revids]
180
193
 
181
194
    def revision_trees(self, revids):
182
195
        for revid in revids:
190
203
            inv.revision_id = revision_id
191
204
            return revisiontree.RevisionTree(self, inv, revision_id)
192
205
 
193
 
        return GitRevisionTree(self, revision_id)
 
206
        return GitRevisionTree(self, self.get_mapping(), revision_id)
194
207
 
195
208
    def get_inventory(self, revision_id):
196
209
        assert revision_id != None
199
212
    def set_make_working_trees(self, trees):
200
213
        pass
201
214
 
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("__", "_")
 
215
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
216
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
209
217
 
210
218
 
211
219
class GitRevisionTree(revisiontree.RevisionTree):
212
220
 
213
 
    def __init__(self, repository, revision_id):
 
221
    def __init__(self, repository, mapping, revision_id):
214
222
        self._repository = repository
215
223
        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
 
224
        assert isinstance(revision_id, str)
 
225
        self.mapping = mapping
 
226
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
 
227
        try:
 
228
            commit = repository._git.commit(git_id)
 
229
        except KeyError, r:
 
230
            raise errors.NoSuchRevision(repository, revision_id)
 
231
        self.tree = commit.tree
218
232
        self._inventory = inventory.Inventory(revision_id=revision_id)
219
233
        self._inventory.root.revision = revision_id
220
234
        self._build_inventory(self.tree, self._inventory.root, "")
225
239
    def get_file_text(self, file_id):
226
240
        entry = self._inventory[file_id]
227
241
        if entry.kind == 'directory': return ""
228
 
        return self._repository._git.blob(entry.text_id).data
 
242
        return self._repository._git.get_blob(entry.text_id).data
229
243
 
230
 
    def _build_inventory(self, tree, ie, path):
 
244
    def _build_inventory(self, tree_id, ie, path):
231
245
        assert isinstance(path, str)
232
 
        for name, mode, hexsha in tree.entries():
 
246
        tree = self._repository._git.tree(tree_id)
 
247
        for mode, name, hexsha in tree.entries():
233
248
            basename = name.decode("utf-8")
234
249
            if path == "":
235
250
                child_path = name
236
251
            else:
237
252
                child_path = urlutils.join(path, name)
238
 
            file_id = escape_file_id(child_path.encode('utf-8'))
239
 
            if mode[0] == '0':
 
253
            file_id = self.mapping.generate_file_id(child_path)
 
254
            entry_kind = (mode & 0700000) / 0100000
 
255
            if entry_kind == 0:
240
256
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
241
 
            elif mode[0] == '1':
242
 
                if mode[1] == '0':
 
257
            elif entry_kind == 1:
 
258
                file_kind = (mode & 070000) / 010000
 
259
                b = self._repository._git.get_blob(hexsha)
 
260
                if file_kind == 0:
243
261
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
244
262
                    child_ie.text_sha1 = osutils.sha_string(b.data)
245
 
                elif mode[1] == '2':
 
263
                elif file_kind == 2:
246
264
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
247
265
                    child_ie.text_sha1 = osutils.sha_string("")
248
266
                else:
249
267
                    raise AssertionError(
250
 
                        "Unknown file kind, perms=%r." % (mode,))
 
268
                        "Unknown file kind, perms=%o." % (mode,))
251
269
                child_ie.text_id = b.id
252
 
                child_ie.text_size = b.size
 
270
                child_ie.text_size = len(b.data)
253
271
            else:
254
272
                raise AssertionError(
255
273
                    "Unknown blob kind, perms=%r." % (mode,))
256
 
            child_ie.executable = bool(int(mode[3:], 8) & 0111)
 
274
            fs_mode = mode & 0777
 
275
            child_ie.executable = bool(fs_mode & 0111)
257
276
            child_ie.revision = self.revision_id
258
277
            self._inventory.add(child_ie)
259
 
            if mode[0] == '0':
260
 
                self._build_inventory(b, child_ie, child_path)
 
278
            if entry_kind == 0:
 
279
                self._build_inventory(hexsha, child_ie, child_path)
261
280
 
262
281
 
263
282
class GitFormat(object):
264
283
 
265
284
    supports_tree_reference = False
 
285
    rich_root_data = True
266
286
 
267
287
    def get_format_description(self):
268
288
        return "Git Repository"
 
289
 
 
290
    def initialize(self, url, shared=False, _internal=False):
 
291
        raise bzr_errors.UninitializableFormat(self)
 
292
 
 
293
    def check_conversion_target(self, target_repo_format):
 
294
        return target_repo_format.rich_root_data