/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 bzr-foreign.

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 (
 
36
        ForeignRepository,
35
37
        ForeignRevision,
36
38
        )
 
39
from bzrlib.trace import mutter
37
40
from bzrlib.transport import get_transport
38
41
 
39
42
from bzrlib.plugins.git.foreign import (
40
 
    ForeignRepository,
41
43
    versionedfiles,
42
44
    )
43
45
from bzrlib.plugins.git.mapping import default_mapping
60
62
    _serializer = None
61
63
 
62
64
    def __init__(self, gitdir, lockfiles):
 
65
        # FIXME: This also caches negatives. Need to be more careful 
 
66
        # about this once we start writing to git
 
67
        self._parents_provider = graph.CachingParentsProvider(self)
 
68
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
63
69
        self.base = gitdir.root_transport.base
64
70
        self.bzrdir = gitdir
65
 
        self.control_files = lockfiles
66
71
        self._git = gitdir._git
67
72
        self.texts = None
68
73
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
69
74
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
70
 
        self._format = GitFormat()
71
 
        self._fallback_repositories = []
72
75
        self.tags = GitTags(self._git.get_tags())
 
76
        from bzrlib.plugins.git import fetch
 
77
        repository.InterRepository.register_optimiser(fetch.InterFromGitRepository)
73
78
 
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])
 
79
    def all_revision_ids(self):
 
80
        ret = set([revision.NULL_REVISION])
 
81
        if self._git.heads() == []:
 
82
            return ret
 
83
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
 
84
        ret = set(bzr_heads)
 
85
        graph = self.get_graph()
 
86
        for rev, parents in graph.iter_ancestry(bzr_heads):
 
87
            ret.add(rev)
85
88
        return ret
86
89
 
87
90
    def is_shared(self):
88
91
        return True
89
92
 
90
93
    def supports_rich_root(self):
91
 
        return False
 
94
        return True
92
95
 
93
96
    #def get_revision_delta(self, revision_id):
94
97
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
95
98
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
96
99
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
97
100
 
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
 
101
    def _make_parents_provider(self):
 
102
        """See Repository._make_parents_provider()."""
 
103
        return self._parents_provider
 
104
 
 
105
    def get_parent_map(self, revids):
 
106
        parent_map = {}
 
107
        mutter("get_parent_map(%r)", revids)
 
108
        for revision_id in revids:
 
109
            assert isinstance(revision_id, str)
 
110
            if revision_id == revision.NULL_REVISION:
 
111
                parent_map[revision_id] = ()
 
112
                continue
 
113
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
 
114
            commit  = self._git.commit(hexsha)
 
115
            if commit is None:
 
116
                continue
 
117
            else:
 
118
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
 
119
        return parent_map
 
120
 
 
121
    def get_ancestry(self, revision_id, topo_sorted=True):
 
122
        """See Repository.get_ancestry().
 
123
        """
 
124
        if revision_id is None:
 
125
            return self._all_revision_ids()
 
126
        assert isinstance(revision_id, str)
 
127
        ancestry = []
 
128
        graph = self.get_graph()
 
129
        for rev, parents in graph.iter_ancestry([revision_id]):
 
130
            if rev == revision.NULL_REVISION:
 
131
                rev = None
 
132
            ancestry.append(rev)
 
133
        ancestry.reverse()
 
134
        return ancestry
 
135
 
 
136
    def _warn_if_deprecated(self):
 
137
        # This class isn't deprecated
 
138
        pass
110
139
 
111
140
    def get_signature_text(self, revision_id):
112
141
        raise errors.NoSuchRevision(self, revision_id)
126
155
    def get_mapping(self):
127
156
        return default_mapping
128
157
 
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
158
    def lookup_git_revid(self, bzr_revid, mapping):
141
159
        try:
142
160
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
143
161
        except errors.InvalidRevisionId:
144
 
            raise errors.NoSuchRevision(bzr_revid, self)
 
162
            raise errors.NoSuchRevision(self, bzr_revid)
145
163
 
146
164
    def get_revision(self, revision_id):
147
165
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
148
166
        commit = self._git.commit(git_commit_id)
149
167
        # print "fetched revision:", git_commit_id
 
168
        if commit is None:
 
169
            raise errors.NoSuchRevision(self, revision_id)
150
170
        revision = self._parse_rev(commit, self.get_mapping())
 
171
        assert revision is not None
151
172
        return revision
152
173
 
153
174
    def has_revision(self, revision_id):
154
175
        try:
155
176
            self.get_revision(revision_id)
156
 
        except NoSuchRevision:
 
177
        except errors.NoSuchRevision:
157
178
            return False
158
179
        else:
159
180
            return True
160
181
 
161
 
    def get_revisions(self, revisions):
162
 
        return [self.get_revision(r) for r in revisions]
 
182
    def get_revisions(self, revids):
 
183
        return [self.get_revision(r) for r in revids]
163
184
 
164
185
    @classmethod
165
186
    def _parse_rev(klass, commit, mapping):
170
191
        if commit is None:
171
192
            raise AssertionError("Commit object can't be None")
172
193
        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])
 
194
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p) for p in commit.parents])
174
195
        rev.message = commit.message.decode("utf-8", "replace")
175
196
        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)
 
197
        if commit.committer != commit.author:
 
198
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
199
        rev.timestamp = commit.commit_time
178
200
        rev.timezone = 0
179
201
        return rev
180
202
 
225
247
    def get_file_text(self, file_id):
226
248
        entry = self._inventory[file_id]
227
249
        if entry.kind == 'directory': return ""
228
 
        return self._repository._git.blob(entry.text_id).data
 
250
        return self._repository._git.get_blob(entry.text_id).data
229
251
 
230
 
    def _build_inventory(self, tree, ie, path):
 
252
    def _build_inventory(self, tree_id, ie, path):
231
253
        assert isinstance(path, str)
232
 
        for name, mode, hexsha in tree.entries():
 
254
        tree = self._repository._git.get_tree(tree_id)
 
255
        for mode, name, hexsha in tree.entries():
233
256
            basename = name.decode("utf-8")
234
257
            if path == "":
235
258
                child_path = name
236
259
            else:
237
260
                child_path = urlutils.join(path, name)
238
261
            file_id = escape_file_id(child_path.encode('utf-8'))
239
 
            if mode[0] == '0':
 
262
            entry_kind = (mode & 0700000) / 0100000
 
263
            if entry_kind == 0:
240
264
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
241
 
            elif mode[0] == '1':
242
 
                if mode[1] == '0':
 
265
            elif entry_kind == 1:
 
266
                file_kind = (mode & 070000) / 010000
 
267
                b = self._repository._git.get_blob(hexsha)
 
268
                if file_kind == 0:
243
269
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
244
270
                    child_ie.text_sha1 = osutils.sha_string(b.data)
245
 
                elif mode[1] == '2':
 
271
                elif file_kind == 2:
246
272
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
247
273
                    child_ie.text_sha1 = osutils.sha_string("")
248
274
                else:
249
275
                    raise AssertionError(
250
 
                        "Unknown file kind, perms=%r." % (mode,))
 
276
                        "Unknown file kind, perms=%o." % (mode,))
251
277
                child_ie.text_id = b.id
252
 
                child_ie.text_size = b.size
 
278
                child_ie.text_size = len(b.data)
253
279
            else:
254
280
                raise AssertionError(
255
281
                    "Unknown blob kind, perms=%r." % (mode,))
256
 
            child_ie.executable = bool(int(mode[3:], 8) & 0111)
 
282
            fs_mode = mode & 0777
 
283
            child_ie.executable = bool(fs_mode & 0111)
257
284
            child_ie.revision = self.revision_id
258
285
            self._inventory.add(child_ie)
259
 
            if mode[0] == '0':
260
 
                self._build_inventory(b, child_ie, child_path)
 
286
            if entry_kind == 0:
 
287
                self._build_inventory(hexsha, child_ie, child_path)
261
288
 
262
289
 
263
290
class GitFormat(object):
264
291
 
265
292
    supports_tree_reference = False
 
293
    rich_root_data = True
266
294
 
267
295
    def get_format_description(self):
268
296
        return "Git Repository"
 
297
 
 
298
    def initialize(self, url, shared=False, _internal=False):
 
299
        raise bzr_errors.UninitializableFormat(self)
 
300
 
 
301
    def check_conversion_target(self, target_repo_format):
 
302
        return target_repo_format.rich_root_data