/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

Merge new 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,
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
61
60
    _serializer = None
62
61
 
63
62
    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)
93
63
        self.base = gitdir.root_transport.base
 
64
        self.bzrdir = gitdir
 
65
        self.control_files = lockfiles
94
66
        self._git = gitdir._git
95
67
        self.texts = None
96
68
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
69
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
 
70
        self._format = GitFormat()
 
71
        self._fallback_repositories = []
98
72
        self.tags = GitTags(self._git.get_tags())
99
73
 
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)
 
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])
109
85
        return ret
110
86
 
 
87
    def is_shared(self):
 
88
        return True
 
89
 
 
90
    def supports_rich_root(self):
 
91
        return False
 
92
 
111
93
    #def get_revision_delta(self, revision_id):
112
94
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
113
95
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
114
96
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
115
97
 
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
 
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
150
110
 
151
111
    def get_signature_text(self, revision_id):
152
112
        raise errors.NoSuchRevision(self, revision_id)
163
123
    def has_signature_for_revision_id(self, revision_id):
164
124
        return False
165
125
 
 
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
 
166
140
    def lookup_git_revid(self, bzr_revid, mapping):
167
141
        try:
168
142
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
169
143
        except errors.InvalidRevisionId:
170
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
144
            raise errors.NoSuchRevision(bzr_revid, self)
171
145
 
172
146
    def get_revision(self, revision_id):
173
147
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
174
 
        try:
175
 
            commit = self._git.commit(git_commit_id)
176
 
        except KeyError:
177
 
            raise errors.NoSuchRevision(self, revision_id)
 
148
        commit = self._git.commit(git_commit_id)
178
149
        # print "fetched revision:", git_commit_id
179
 
        revision = self.get_mapping().import_commit(commit)
180
 
        assert revision is not None
 
150
        revision = self._parse_rev(commit, self.get_mapping())
181
151
        return revision
182
152
 
183
153
    def has_revision(self, revision_id):
184
154
        try:
185
155
            self.get_revision(revision_id)
186
 
        except errors.NoSuchRevision:
 
156
        except NoSuchRevision:
187
157
            return False
188
158
        else:
189
159
            return True
190
160
 
191
 
    def get_revisions(self, revids):
192
 
        return [self.get_revision(r) for r in revids]
 
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
193
180
 
194
181
    def revision_trees(self, revids):
195
182
        for revid in revids:
203
190
            inv.revision_id = revision_id
204
191
            return revisiontree.RevisionTree(self, inv, revision_id)
205
192
 
206
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
193
        return GitRevisionTree(self, revision_id)
207
194
 
208
195
    def get_inventory(self, revision_id):
209
196
        assert revision_id != None
212
199
    def set_make_working_trees(self, trees):
213
200
        pass
214
201
 
215
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
216
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
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("__", "_")
217
209
 
218
210
 
219
211
class GitRevisionTree(revisiontree.RevisionTree):
220
212
 
221
 
    def __init__(self, repository, mapping, revision_id):
 
213
    def __init__(self, repository, revision_id):
222
214
        self._repository = repository
223
215
        self.revision_id = revision_id
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
 
216
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
 
217
        self.tree = repository._git.commit(git_id).tree
232
218
        self._inventory = inventory.Inventory(revision_id=revision_id)
233
219
        self._inventory.root.revision = revision_id
234
220
        self._build_inventory(self.tree, self._inventory.root, "")
239
225
    def get_file_text(self, file_id):
240
226
        entry = self._inventory[file_id]
241
227
        if entry.kind == 'directory': return ""
242
 
        return self._repository._git.get_blob(entry.text_id).data
 
228
        return self._repository._git.blob(entry.text_id).data
243
229
 
244
 
    def _build_inventory(self, tree_id, ie, path):
 
230
    def _build_inventory(self, tree, ie, path):
245
231
        assert isinstance(path, str)
246
 
        tree = self._repository._git.tree(tree_id)
247
 
        for mode, name, hexsha in tree.entries():
 
232
        for name, mode, hexsha in tree.entries():
248
233
            basename = name.decode("utf-8")
249
234
            if path == "":
250
235
                child_path = name
251
236
            else:
252
237
                child_path = urlutils.join(path, name)
253
 
            file_id = self.mapping.generate_file_id(child_path)
254
 
            entry_kind = (mode & 0700000) / 0100000
255
 
            if entry_kind == 0:
 
238
            file_id = escape_file_id(child_path.encode('utf-8'))
 
239
            if mode[0] == '0':
256
240
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
257
 
            elif entry_kind == 1:
258
 
                file_kind = (mode & 070000) / 010000
259
 
                b = self._repository._git.get_blob(hexsha)
260
 
                if file_kind == 0:
 
241
            elif mode[0] == '1':
 
242
                if mode[1] == '0':
261
243
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
262
244
                    child_ie.text_sha1 = osutils.sha_string(b.data)
263
 
                elif file_kind == 2:
 
245
                elif mode[1] == '2':
264
246
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
265
247
                    child_ie.text_sha1 = osutils.sha_string("")
266
248
                else:
267
249
                    raise AssertionError(
268
 
                        "Unknown file kind, perms=%o." % (mode,))
 
250
                        "Unknown file kind, perms=%r." % (mode,))
269
251
                child_ie.text_id = b.id
270
 
                child_ie.text_size = len(b.data)
 
252
                child_ie.text_size = b.size
271
253
            else:
272
254
                raise AssertionError(
273
255
                    "Unknown blob kind, perms=%r." % (mode,))
274
 
            fs_mode = mode & 0777
275
 
            child_ie.executable = bool(fs_mode & 0111)
 
256
            child_ie.executable = bool(int(mode[3:], 8) & 0111)
276
257
            child_ie.revision = self.revision_id
277
258
            self._inventory.add(child_ie)
278
 
            if entry_kind == 0:
279
 
                self._build_inventory(hexsha, child_ie, child_path)
 
259
            if mode[0] == '0':
 
260
                self._build_inventory(b, child_ie, child_path)
280
261
 
281
262
 
282
263
class GitFormat(object):
283
264
 
284
265
    supports_tree_reference = False
285
 
    rich_root_data = True
286
266
 
287
267
    def get_format_description(self):
288
268
        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