/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

Fix some bit of fetching.

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