/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

Import dulwich from subdir if it's not installed on the system.

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,
27
26
    inventory,
28
27
    osutils,
29
28
    repository,
33
32
    versionedfile,
34
33
    )
35
34
from bzrlib.foreign import (
36
 
        ForeignRepository,
 
35
        ForeignRevision,
37
36
        )
38
 
from bzrlib.trace import mutter
39
37
from bzrlib.transport import get_transport
40
38
 
41
39
from bzrlib.plugins.git.foreign import (
 
40
    ForeignRepository,
42
41
    versionedfiles,
43
42
    )
44
43
from bzrlib.plugins.git.mapping import default_mapping
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
 
 
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)
92
63
        self.base = gitdir.root_transport.base
 
64
        self.bzrdir = gitdir
 
65
        self.control_files = lockfiles
93
66
        self._git = gitdir._git
94
67
        self.texts = None
95
68
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
96
69
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
 
70
        self._format = GitFormat()
 
71
        self._fallback_repositories = []
97
72
        self.tags = GitTags(self._git.get_tags())
98
73
 
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)
 
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])
108
85
        return ret
109
86
 
 
87
    def is_shared(self):
 
88
        return True
 
89
 
 
90
    def supports_rich_root(self):
 
91
        return False
 
92
 
110
93
    #def get_revision_delta(self, revision_id):
111
94
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
112
95
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
113
96
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
114
97
 
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
 
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
149
110
 
150
111
    def get_signature_text(self, revision_id):
151
112
        raise errors.NoSuchRevision(self, revision_id)
162
123
    def has_signature_for_revision_id(self, revision_id):
163
124
        return False
164
125
 
 
126
    def get_parent_map(self, revision_ids):
 
127
        ret = {}
 
128
        for revid in revision_ids:
 
129
            if revid == revision.NULL_REVISION:
 
130
                ret[revid] = ()
 
131
            else:
 
132
                ret[revid] = tuple([self.get_mapping().revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
133
        return ret
 
134
 
165
135
    def lookup_git_revid(self, bzr_revid, mapping):
166
136
        try:
167
137
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
168
138
        except errors.InvalidRevisionId:
169
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
139
            raise errors.NoSuchRevision(bzr_revid, self)
170
140
 
171
141
    def get_revision(self, revision_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)
 
142
        git_commit_id = self.lookup_git_revid(revision_id, default_mapping)
 
143
        commit = self._git.commit(git_commit_id)
177
144
        # print "fetched revision:", git_commit_id
178
 
        revision = self.get_mapping().import_commit(commit)
179
 
        assert revision is not None
 
145
        revision = self._parse_rev(commit, default_mapping)
180
146
        return revision
181
147
 
182
148
    def has_revision(self, revision_id):
183
149
        try:
184
150
            self.get_revision(revision_id)
185
 
        except errors.NoSuchRevision:
 
151
        except NoSuchRevision:
186
152
            return False
187
153
        else:
188
154
            return True
189
155
 
190
 
    def get_revisions(self, revids):
191
 
        return [self.get_revision(r) for r in revids]
 
156
    def get_revisions(self, revisions):
 
157
        return [self.get_revision(r) for r in revisions]
 
158
 
 
159
    @classmethod
 
160
    def _parse_rev(klass, commit, mapping):
 
161
        """Convert a git commit to a bzr revision.
 
162
 
 
163
        :return: a `bzrlib.revision.Revision` object.
 
164
        """
 
165
        if commit is None:
 
166
            raise AssertionError("Commit object can't be None")
 
167
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
168
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
169
        rev.message = commit.message.decode("utf-8", "replace")
 
170
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
171
        rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
172
        rev.timestamp = time.mktime(commit.committed_date)
 
173
        rev.timezone = 0
 
174
        return rev
192
175
 
193
176
    def revision_trees(self, revids):
194
177
        for revid in revids:
202
185
            inv.revision_id = revision_id
203
186
            return revisiontree.RevisionTree(self, inv, revision_id)
204
187
 
205
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
188
        return GitRevisionTree(self, revision_id)
206
189
 
207
190
    def get_inventory(self, revision_id):
208
191
        assert revision_id != None
211
194
    def set_make_working_trees(self, trees):
212
195
        pass
213
196
 
214
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
215
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
197
 
 
198
def escape_file_id(file_id):
 
199
    return file_id.replace('_', '__').replace(' ', '_s')
 
200
 
 
201
 
 
202
def unescape_file_id(file_id):
 
203
    return file_id.replace("_s", " ").replace("__", "_")
216
204
 
217
205
 
218
206
class GitRevisionTree(revisiontree.RevisionTree):
219
207
 
220
 
    def __init__(self, repository, mapping, revision_id):
 
208
    def __init__(self, repository, revision_id):
221
209
        self._repository = repository
222
210
        self.revision_id = revision_id
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
 
211
        git_id = repository.lookup_git_revid(revision_id, default_mapping)
 
212
        self.tree = repository._git.commit(git_id).tree
231
213
        self._inventory = inventory.Inventory(revision_id=revision_id)
232
214
        self._inventory.root.revision = revision_id
233
215
        self._build_inventory(self.tree, self._inventory.root, "")
238
220
    def get_file_text(self, file_id):
239
221
        entry = self._inventory[file_id]
240
222
        if entry.kind == 'directory': return ""
241
 
        return self._repository._git.get_blob(entry.text_id).data
 
223
        return self._repository._git.blob(entry.text_id).data
242
224
 
243
 
    def _build_inventory(self, tree_id, ie, path):
 
225
    def _build_inventory(self, tree, ie, path):
244
226
        assert isinstance(path, str)
245
 
        tree = self._repository._git.tree(tree_id)
246
 
        for mode, name, hexsha in tree.entries():
247
 
            basename = name.decode("utf-8")
 
227
        for b in tree.contents:
 
228
            basename = b.name.decode("utf-8")
248
229
            if path == "":
249
 
                child_path = name
 
230
                child_path = b.name
250
231
            else:
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:
 
232
                child_path = urlutils.join(path, b.name)
 
233
            file_id = escape_file_id(child_path.encode('utf-8'))
 
234
            if b.mode[0] == '0':
255
235
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
256
 
            elif entry_kind == 1:
257
 
                file_kind = (mode & 070000) / 010000
258
 
                b = self._repository._git.get_blob(hexsha)
259
 
                if file_kind == 0:
 
236
            elif b.mode[0] == '1':
 
237
                if b.mode[1] == '0':
260
238
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
261
239
                    child_ie.text_sha1 = osutils.sha_string(b.data)
262
 
                elif file_kind == 2:
 
240
                elif b.mode[1] == '2':
263
241
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
264
242
                    child_ie.text_sha1 = osutils.sha_string("")
265
243
                else:
266
244
                    raise AssertionError(
267
 
                        "Unknown file kind, perms=%o." % (mode,))
 
245
                        "Unknown file kind, perms=%r." % (b.mode,))
268
246
                child_ie.text_id = b.id
269
 
                child_ie.text_size = len(b.data)
 
247
                child_ie.text_size = b.size
270
248
            else:
271
249
                raise AssertionError(
272
 
                    "Unknown blob kind, perms=%r." % (mode,))
273
 
            fs_mode = mode & 0777
274
 
            child_ie.executable = bool(fs_mode & 0111)
 
250
                    "Unknown blob kind, perms=%r." % (b.mode,))
 
251
            child_ie.executable = bool(int(b.mode[3:], 8) & 0111)
275
252
            child_ie.revision = self.revision_id
276
253
            self._inventory.add(child_ie)
277
 
            if entry_kind == 0:
278
 
                self._build_inventory(hexsha, child_ie, child_path)
 
254
            if b.mode[0] == '0':
 
255
                self._build_inventory(b, child_ie, child_path)
279
256
 
280
257
 
281
258
class GitFormat(object):
282
259
 
283
260
    supports_tree_reference = False
284
 
    rich_root_data = True
285
261
 
286
262
    def get_format_description(self):
287
263
        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