/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
81
81
        while cms != []:
82
82
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
83
83
            skip += max_count
84
 
            ret.update([self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms])
 
84
            ret.update([default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms])
85
85
        return ret
86
86
 
87
87
    def is_shared(self):
103
103
            max_count = 1000
104
104
            cms = None
105
105
            while cms != []:
106
 
                cms = self._git.commits(self.lookup_git_revid(revision_id, self.get_mapping()), max_count=max_count, skip=skip)
 
106
                cms = self._git.commits(self.lookup_git_revid(revision_id, default_mapping), max_count=max_count, skip=skip)
107
107
                skip += max_count
108
 
                ret += [self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms]
 
108
                ret += [default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms]
109
109
        return [None] + ret
110
110
 
111
111
    def get_signature_text(self, revision_id):
123
123
    def has_signature_for_revision_id(self, revision_id):
124
124
        return False
125
125
 
126
 
    def get_mapping(self):
127
 
        return default_mapping
128
 
 
129
126
    def get_parent_map(self, revision_ids):
130
127
        ret = {}
131
128
        for revid in revision_ids:
132
129
            if revid == revision.NULL_REVISION:
133
130
                ret[revid] = ()
134
131
            else:
135
 
                git_commit_id = self.lookup_git_revid(revid, self.get_mapping())
136
 
                commit = self._git.commit(git_commit_id)
137
132
                ret[revid] = tuple([self.get_mapping().revision_id_foreign_to_bzr(p.id) for p in commit.parents])
138
133
        return ret
139
134
 
144
139
            raise errors.NoSuchRevision(bzr_revid, self)
145
140
 
146
141
    def get_revision(self, revision_id):
147
 
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
142
        git_commit_id = self.lookup_git_revid(revision_id, default_mapping)
148
143
        commit = self._git.commit(git_commit_id)
149
144
        # print "fetched revision:", git_commit_id
150
 
        revision = self._parse_rev(commit, self.get_mapping())
 
145
        revision = self._parse_rev(commit, default_mapping)
151
146
        return revision
152
147
 
153
148
    def has_revision(self, revision_id):
213
208
    def __init__(self, repository, revision_id):
214
209
        self._repository = repository
215
210
        self.revision_id = revision_id
216
 
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
 
211
        git_id = repository.lookup_git_revid(revision_id, default_mapping)
217
212
        self.tree = repository._git.commit(git_id).tree
218
213
        self._inventory = inventory.Inventory(revision_id=revision_id)
219
214
        self._inventory.root.revision = revision_id
229
224
 
230
225
    def _build_inventory(self, tree, ie, path):
231
226
        assert isinstance(path, str)
232
 
        for name, mode, hexsha in tree.entries():
233
 
            basename = name.decode("utf-8")
 
227
        for b in tree.contents:
 
228
            basename = b.name.decode("utf-8")
234
229
            if path == "":
235
 
                child_path = name
 
230
                child_path = b.name
236
231
            else:
237
 
                child_path = urlutils.join(path, name)
 
232
                child_path = urlutils.join(path, b.name)
238
233
            file_id = escape_file_id(child_path.encode('utf-8'))
239
 
            if mode[0] == '0':
 
234
            if b.mode[0] == '0':
240
235
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
241
 
            elif mode[0] == '1':
242
 
                if mode[1] == '0':
 
236
            elif b.mode[0] == '1':
 
237
                if b.mode[1] == '0':
243
238
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
244
239
                    child_ie.text_sha1 = osutils.sha_string(b.data)
245
 
                elif mode[1] == '2':
 
240
                elif b.mode[1] == '2':
246
241
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
247
242
                    child_ie.text_sha1 = osutils.sha_string("")
248
243
                else:
249
244
                    raise AssertionError(
250
 
                        "Unknown file kind, perms=%r." % (mode,))
 
245
                        "Unknown file kind, perms=%r." % (b.mode,))
251
246
                child_ie.text_id = b.id
252
247
                child_ie.text_size = b.size
253
248
            else:
254
249
                raise AssertionError(
255
 
                    "Unknown blob kind, perms=%r." % (mode,))
256
 
            child_ie.executable = bool(int(mode[3:], 8) & 0111)
 
250
                    "Unknown blob kind, perms=%r." % (b.mode,))
 
251
            child_ie.executable = bool(int(b.mode[3:], 8) & 0111)
257
252
            child_ie.revision = self.revision_id
258
253
            self._inventory.add(child_ie)
259
 
            if mode[0] == '0':
 
254
            if b.mode[0] == '0':
260
255
                self._build_inventory(b, child_ie, child_path)
261
256
 
262
257