/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

Partially fix pull.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
21
21
 
22
22
import bzrlib
23
23
from bzrlib import (
24
 
    deprecated_graph,
25
24
    errors,
 
25
    graph,
26
26
    inventory,
27
27
    osutils,
28
28
    repository,
29
29
    revision,
30
30
    revisiontree,
 
31
    ui,
31
32
    urlutils,
32
 
    versionedfile,
33
33
    )
34
34
from bzrlib.foreign import (
35
 
        ForeignRevision,
 
35
        ForeignRepository,
36
36
        )
 
37
from bzrlib.trace import mutter
37
38
from bzrlib.transport import get_transport
38
39
 
39
40
from bzrlib.plugins.git.foreign import (
40
 
    ForeignRepository,
41
41
    versionedfiles,
42
42
    )
43
 
from bzrlib.plugins.git.mapping import default_mapping
 
43
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry, inventory_to_tree_and_blobs, revision_to_commit
 
44
from bzrlib.plugins.git.versionedfiles import GitTexts
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 = []
 
98
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
 
99
        self.texts = GitTexts(self)
72
100
        self.tags = GitTags(self._git.get_tags())
73
101
 
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])
 
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)
85
111
        return ret
86
112
 
87
 
    def is_shared(self):
88
 
        return True
89
 
 
90
 
    def supports_rich_root(self):
91
 
        return False
92
 
 
93
113
    #def get_revision_delta(self, revision_id):
94
114
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
95
115
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
96
116
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
97
117
 
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
 
118
    def _make_parents_provider(self):
 
119
        """See Repository._make_parents_provider()."""
 
120
        return self._parents_provider
 
121
 
 
122
    def get_parent_map(self, revids):
 
123
        parent_map = {}
 
124
        mutter("get_parent_map(%r)", revids)
 
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
 
130
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
131
            commit  = self._git.commit(hexsha)
 
132
            if commit is None:
 
133
                continue
 
134
            else:
 
135
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
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
 
152
 
 
153
    def import_revision_gist(self, source, revid, parent_lookup):
 
154
        """Impor the gist of another revision into this Git repository.
 
155
 
 
156
        """
 
157
        objects = []
 
158
        rev = source.get_revision(revid)
 
159
        for sha, object, path in inventory_to_tree_and_blobs(source, None, revid):
 
160
            if path == "":
 
161
                tree_sha = sha
 
162
            objects.append((object, path))
 
163
        commit = revision_to_commit(rev, tree_sha, parent_lookup)
 
164
        objects.append((commit, None))
 
165
        self._git.object_store.add_objects(objects)
 
166
        return commit.sha().hexdigest()
 
167
 
 
168
    def dfetch(self, source, stop_revision):
 
169
        if stop_revision is None:
 
170
            raise NotImplementedError
 
171
        revidmap = {}
 
172
        gitidmap = {}
 
173
        todo = []
 
174
        source.lock_write()
 
175
        try:
 
176
            graph = source.get_graph()
 
177
            ancestry = [x for x in source.get_ancestry(stop_revision) if x is not None]
 
178
            for revid in graph.iter_topo_order(ancestry):
 
179
                if not self.has_revision(revid):
 
180
                    todo.append(revid)
 
181
            pb = ui.ui_factory.nested_progress_bar()
 
182
            try:
 
183
                for i, revid in enumerate(todo):
 
184
                    pb.update("pushing revisions", i, len(todo))
 
185
                    git_commit = self.import_revision_gist(source, revid, gitidmap.__getitem__)
 
186
                    gitidmap[revid] = git_commit
 
187
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(git_commit)
 
188
                    revidmap[revid] = git_revid
 
189
            finally:
 
190
                pb.finished()
 
191
            source.fetch(self, revision_id=revidmap[stop_revision])
 
192
        finally:
 
193
            source.unlock()
 
194
        return revidmap
110
195
 
111
196
    def get_signature_text(self, revision_id):
112
197
        raise errors.NoSuchRevision(self, revision_id)
123
208
    def has_signature_for_revision_id(self, revision_id):
124
209
        return False
125
210
 
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):
 
211
    def lookup_git_revid(self, bzr_revid):
141
212
        try:
142
 
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
213
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
143
214
        except errors.InvalidRevisionId:
144
 
            raise errors.NoSuchRevision(bzr_revid, self)
 
215
            raise errors.NoSuchRevision(self, bzr_revid)
145
216
 
146
217
    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)
 
218
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
219
        try:
 
220
            commit = self._git.commit(git_commit_id)
 
221
        except KeyError:
 
222
            raise errors.NoSuchRevision(self, revision_id)
149
223
        # print "fetched revision:", git_commit_id
150
 
        revision = self._parse_rev(commit, self.get_mapping())
 
224
        revision = mapping.import_commit(commit)
 
225
        assert revision is not None
151
226
        return revision
152
227
 
153
228
    def has_revision(self, revision_id):
154
229
        try:
155
230
            self.get_revision(revision_id)
156
 
        except NoSuchRevision:
 
231
        except errors.NoSuchRevision:
157
232
            return False
158
233
        else:
159
234
            return True
160
235
 
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
 
236
    def get_revisions(self, revids):
 
237
        return [self.get_revision(r) for r in revids]
180
238
 
181
239
    def revision_trees(self, revids):
182
240
        for revid in revids:
199
257
    def set_make_working_trees(self, trees):
200
258
        pass
201
259
 
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("__", "_")
 
260
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
261
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
209
262
 
210
263
 
211
264
class GitRevisionTree(revisiontree.RevisionTree):
213
266
    def __init__(self, repository, revision_id):
214
267
        self._repository = repository
215
268
        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
 
269
        assert isinstance(revision_id, str)
 
270
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
 
271
        try:
 
272
            commit = repository._git.commit(git_id)
 
273
        except KeyError, r:
 
274
            raise errors.NoSuchRevision(repository, revision_id)
 
275
        self.tree = commit.tree
218
276
        self._inventory = inventory.Inventory(revision_id=revision_id)
219
277
        self._inventory.root.revision = revision_id
220
278
        self._build_inventory(self.tree, self._inventory.root, "")
225
283
    def get_file_text(self, file_id):
226
284
        entry = self._inventory[file_id]
227
285
        if entry.kind == 'directory': return ""
228
 
        return self._repository._git.blob(entry.text_id).data
 
286
        return self._repository._git.get_blob(entry.text_id).data
229
287
 
230
 
    def _build_inventory(self, tree, ie, path):
 
288
    def _build_inventory(self, tree_id, ie, path):
231
289
        assert isinstance(path, str)
232
 
        for name, mode, hexsha in tree.entries():
 
290
        tree = self._repository._git.tree(tree_id)
 
291
        for mode, name, hexsha in tree.entries():
233
292
            basename = name.decode("utf-8")
234
293
            if path == "":
235
294
                child_path = name
236
295
            else:
237
296
                child_path = urlutils.join(path, name)
238
 
            file_id = escape_file_id(child_path.encode('utf-8'))
239
 
            if mode[0] == '0':
 
297
            file_id = self.mapping.generate_file_id(child_path)
 
298
            entry_kind = (mode & 0700000) / 0100000
 
299
            if entry_kind == 0:
240
300
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
241
 
            elif mode[0] == '1':
242
 
                if mode[1] == '0':
 
301
            elif entry_kind == 1:
 
302
                file_kind = (mode & 070000) / 010000
 
303
                b = self._repository._git.get_blob(hexsha)
 
304
                if file_kind == 0:
243
305
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
244
306
                    child_ie.text_sha1 = osutils.sha_string(b.data)
245
 
                elif mode[1] == '2':
 
307
                elif file_kind == 2:
246
308
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
247
309
                    child_ie.text_sha1 = osutils.sha_string("")
248
310
                else:
249
311
                    raise AssertionError(
250
 
                        "Unknown file kind, perms=%r." % (mode,))
 
312
                        "Unknown file kind, perms=%o." % (mode,))
251
313
                child_ie.text_id = b.id
252
 
                child_ie.text_size = b.size
 
314
                child_ie.text_size = len(b.data)
253
315
            else:
254
316
                raise AssertionError(
255
317
                    "Unknown blob kind, perms=%r." % (mode,))
256
 
            child_ie.executable = bool(int(mode[3:], 8) & 0111)
 
318
            fs_mode = mode & 0777
 
319
            child_ie.executable = bool(fs_mode & 0111)
257
320
            child_ie.revision = self.revision_id
258
321
            self._inventory.add(child_ie)
259
 
            if mode[0] == '0':
260
 
                self._build_inventory(b, child_ie, child_path)
 
322
            if entry_kind == 0:
 
323
                self._build_inventory(hexsha, child_ie, child_path)
261
324
 
262
325
 
263
326
class GitFormat(object):
264
327
 
265
328
    supports_tree_reference = False
 
329
    rich_root_data = True
266
330
 
267
331
    def get_format_description(self):
268
332
        return "Git Repository"
 
333
 
 
334
    def initialize(self, url, shared=False, _internal=False):
 
335
        raise bzr_errors.UninitializableFormat(self)
 
336
 
 
337
    def check_conversion_target(self, target_repo_format):
 
338
        return target_repo_format.rich_root_data