/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
16
16
 
17
17
"""An adapter between a Git Repository and a Bazaar Branch"""
18
18
 
19
 
import git
20
19
import os
21
20
import time
22
21
 
24
23
from bzrlib import (
25
24
    deprecated_graph,
26
25
    errors,
 
26
    graph,
27
27
    inventory,
28
28
    osutils,
29
29
    repository,
32
32
    urlutils,
33
33
    versionedfile,
34
34
    )
 
35
from bzrlib.foreign import (
 
36
        ForeignRepository,
 
37
        ForeignRevision,
 
38
        )
 
39
from bzrlib.trace import mutter
35
40
from bzrlib.transport import get_transport
36
41
 
37
42
from bzrlib.plugins.git.foreign import (
38
 
    versionedfiles
 
43
    versionedfiles,
39
44
    )
40
45
from bzrlib.plugins.git.mapping import default_mapping
41
46
 
42
 
 
43
 
class GitRepository(repository.Repository):
 
47
from bzrlib.plugins.git import git
 
48
 
 
49
 
 
50
class GitTags(object):
 
51
 
 
52
    def __init__(self, tags):
 
53
        self._tags = tags
 
54
 
 
55
    def __iter__(self):
 
56
        return iter(self._tags)
 
57
 
 
58
 
 
59
class GitRepository(ForeignRepository):
44
60
    """An adapter to git repositories for bzr."""
45
61
 
46
62
    _serializer = None
47
63
 
48
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)
49
69
        self.base = gitdir.root_transport.base
50
70
        self.bzrdir = gitdir
51
 
        self.control_files = lockfiles
52
71
        self._git = gitdir._git
53
72
        self.texts = None
54
73
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
55
74
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
56
 
        self._format = GitFormat()
57
 
        self._fallback_repositories = []
 
75
        self.tags = GitTags(self._git.get_tags())
 
76
        from bzrlib.plugins.git import fetch
 
77
        repository.InterRepository.register_optimiser(fetch.InterFromGitRepository)
58
78
 
59
 
    def _all_revision_ids(self):
60
 
        if self._git.heads == []:
61
 
            return set()
62
 
        ret = set()
63
 
        skip = 0
64
 
        max_count = 1000
65
 
        cms = None
66
 
        while cms != []:
67
 
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
68
 
            skip += max_count
69
 
            ret.update([default_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)
70
88
        return ret
71
89
 
72
90
    def is_shared(self):
73
91
        return True
74
92
 
75
93
    def supports_rich_root(self):
76
 
        return False
 
94
        return True
77
95
 
78
96
    #def get_revision_delta(self, revision_id):
79
97
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
80
98
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
81
99
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
82
100
 
83
 
    def get_ancestry(self, revision_id):
84
 
        revision_id = revision.ensure_null(revision_id)
85
 
        ret = []
86
 
        if revision_id != revision.NULL_REVISION:
87
 
            skip = 0
88
 
            max_count = 1000
89
 
            cms = None
90
 
            while cms != []:
91
 
                cms = self._git.commits(self.lookup_git_revid(revision_id, default_mapping), max_count=max_count, skip=skip)
92
 
                skip += max_count
93
 
                ret += [default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms]
94
 
        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
95
139
 
96
140
    def get_signature_text(self, revision_id):
97
141
        raise errors.NoSuchRevision(self, revision_id)
98
142
 
 
143
    def lookup_revision_id(self, revid):
 
144
        """Lookup a revision id.
 
145
        
 
146
        :param revid: Bazaar revision id.
 
147
        :return: Tuple with git revisionid and mapping.
 
148
        """
 
149
        # Yes, this doesn't really work, but good enough as a stub
 
150
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
 
151
 
99
152
    def has_signature_for_revision_id(self, revision_id):
100
153
        return False
101
154
 
102
 
    def get_parent_map(self, revision_ids):
103
 
        ret = {}
104
 
        for revid in revision_ids:
105
 
            if revid == revision.NULL_REVISION:
106
 
                ret[revid] = ()
107
 
            else:
108
 
                commit = self._git.commit(self.lookup_git_revid(revid, default_mapping))
109
 
                ret[revid] = tuple([default_mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
110
 
        return ret
 
155
    def get_mapping(self):
 
156
        return default_mapping
111
157
 
112
158
    def lookup_git_revid(self, bzr_revid, mapping):
113
159
        try:
114
160
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
115
161
        except errors.InvalidRevisionId:
116
 
            raise errors.NoSuchRevision(bzr_revid, self)
 
162
            raise errors.NoSuchRevision(self, bzr_revid)
117
163
 
118
164
    def get_revision(self, revision_id):
119
 
        git_commit_id = self.lookup_git_revid(revision_id, default_mapping)
 
165
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
120
166
        commit = self._git.commit(git_commit_id)
121
167
        # print "fetched revision:", git_commit_id
122
 
        revision = self._parse_rev(commit)
 
168
        if commit is None:
 
169
            raise errors.NoSuchRevision(self, revision_id)
 
170
        revision = self._parse_rev(commit, self.get_mapping())
 
171
        assert revision is not None
123
172
        return revision
124
173
 
125
174
    def has_revision(self, revision_id):
126
175
        try:
127
176
            self.get_revision(revision_id)
128
 
        except NoSuchRevision:
 
177
        except errors.NoSuchRevision:
129
178
            return False
130
179
        else:
131
180
            return True
132
181
 
133
 
    def get_revisions(self, revisions):
134
 
        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]
135
184
 
136
185
    @classmethod
137
 
    def _parse_rev(klass, commit):
 
186
    def _parse_rev(klass, commit, mapping):
138
187
        """Convert a git commit to a bzr revision.
139
188
 
140
189
        :return: a `bzrlib.revision.Revision` object.
141
190
        """
142
 
        rev = revision.Revision(default_mapping.revision_id_foreign_to_bzr(commit.id))
143
 
        rev.parent_ids = tuple([default_mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
144
 
        rev.inventory_sha1 = ""
 
191
        if commit is None:
 
192
            raise AssertionError("Commit object can't be None")
 
193
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
194
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p) for p in commit.parents])
145
195
        rev.message = commit.message.decode("utf-8", "replace")
146
 
        rev.committer = str(commit.committer)
147
 
        rev.properties['author'] = str(commit.author)
148
 
        rev.timestamp = time.mktime(commit.committed_date)
 
196
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
197
        if commit.committer != commit.author:
 
198
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
199
        rev.timestamp = commit.commit_time
149
200
        rev.timezone = 0
150
201
        return rev
151
202
 
184
235
    def __init__(self, repository, revision_id):
185
236
        self._repository = repository
186
237
        self.revision_id = revision_id
187
 
        git_id = repository.lookup_git_revid(revision_id, default_mapping)
 
238
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
188
239
        self.tree = repository._git.commit(git_id).tree
189
240
        self._inventory = inventory.Inventory(revision_id=revision_id)
190
241
        self._inventory.root.revision = revision_id
196
247
    def get_file_text(self, file_id):
197
248
        entry = self._inventory[file_id]
198
249
        if entry.kind == 'directory': return ""
199
 
        return self._repository._git.blob(entry.text_id).data
 
250
        return self._repository._git.get_blob(entry.text_id).data
200
251
 
201
 
    def _build_inventory(self, tree, ie, path):
 
252
    def _build_inventory(self, tree_id, ie, path):
202
253
        assert isinstance(path, str)
203
 
        for b in tree.contents:
204
 
            basename = b.name.decode("utf-8")
 
254
        tree = self._repository._git.get_tree(tree_id)
 
255
        for mode, name, hexsha in tree.entries():
 
256
            basename = name.decode("utf-8")
205
257
            if path == "":
206
 
                child_path = b.name
 
258
                child_path = name
207
259
            else:
208
 
                child_path = urlutils.join(path, b.name)
 
260
                child_path = urlutils.join(path, name)
209
261
            file_id = escape_file_id(child_path.encode('utf-8'))
210
 
            if b.mode[0] == '0':
 
262
            entry_kind = (mode & 0700000) / 0100000
 
263
            if entry_kind == 0:
211
264
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
212
 
            elif b.mode[0] == '1':
213
 
                if b.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:
214
269
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
215
270
                    child_ie.text_sha1 = osutils.sha_string(b.data)
216
 
                elif b.mode[1] == '2':
 
271
                elif file_kind == 2:
217
272
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
218
273
                    child_ie.text_sha1 = osutils.sha_string("")
219
274
                else:
220
275
                    raise AssertionError(
221
 
                        "Unknown file kind, perms=%r." % (b.mode,))
 
276
                        "Unknown file kind, perms=%o." % (mode,))
222
277
                child_ie.text_id = b.id
223
 
                child_ie.text_size = b.size
 
278
                child_ie.text_size = len(b.data)
224
279
            else:
225
280
                raise AssertionError(
226
 
                    "Unknown blob kind, perms=%r." % (b.mode,))
227
 
            child_ie.executable = bool(int(b.mode[3:], 8) & 0111)
 
281
                    "Unknown blob kind, perms=%r." % (mode,))
 
282
            fs_mode = mode & 0777
 
283
            child_ie.executable = bool(fs_mode & 0111)
228
284
            child_ie.revision = self.revision_id
229
285
            self._inventory.add(child_ie)
230
 
            if b.mode[0] == '0':
231
 
                self._build_inventory(b, child_ie, child_path)
 
286
            if entry_kind == 0:
 
287
                self._build_inventory(hexsha, child_ie, child_path)
232
288
 
233
289
 
234
290
class GitFormat(object):
235
291
 
236
292
    supports_tree_reference = False
 
293
    rich_root_data = True
237
294
 
238
295
    def get_format_description(self):
239
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