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