/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 inventory.py

Cope with API changes in Dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
inventory.py
18
18
"""Git inventory."""
19
19
 
20
20
 
 
21
import stat
 
22
 
 
23
 
21
24
from dulwich.objects import (
22
25
    Blob,
23
26
    Tree,
29
32
    inventory,
30
33
    osutils,
31
34
    ui,
32
 
    )
33
 
 
34
 
from bzrlib.plugins.git.mapping import (
35
 
    mode_kind,
36
 
    mode_is_executable,
 
35
    urlutils,
37
36
    )
38
37
 
39
38
 
50
49
        self.path = path
51
50
        self.revision = self._inventory.revision_id
52
51
        self.executable = executable
53
 
        self.file_id = self._inventory.fileid_map.lookup_file_id(
54
 
            path.encode('utf-8'))
 
52
        self.file_id = self._inventory.mapping.generate_file_id(path.encode('utf-8'))
55
53
 
56
54
    @property
57
55
    def object(self):
68
66
    _git_class = Blob
69
67
 
70
68
    def __init__(self, inv, parent_id, hexsha, path, basename, executable):
71
 
        super(GitInventoryFile, self).__init__(inv, parent_id, hexsha, path,
72
 
            basename, executable)
 
69
        super(GitInventoryFile, self).__init__(inv, parent_id, hexsha, path, basename, executable)
73
70
        self.kind = 'file'
74
71
        self.text_id = None
75
72
        self.symlink_target = None
76
73
 
77
74
    @property
78
75
    def text_sha1(self):
79
 
        return osutils.sha_strings(self.object.chunked)
 
76
        return osutils.sha_string(self.object.data)
80
77
 
81
78
    @property
82
79
    def text_size(self):
97
94
        return ''
98
95
 
99
96
    def copy(self):
100
 
        other = inventory.InventoryFile(self.file_id, self.name,
101
 
            self.parent_id)
 
97
        other = inventory.InventoryFile(self.file_id, self.name, self.parent_id)
102
98
        other.executable = self.executable
103
99
        other.text_id = self.text_id
104
100
        other.text_sha1 = self.text_sha1
127
123
 
128
124
    def copy(self):
129
125
        other = inventory.InventoryLink(self.file_id, self.name, self.parent_id)
130
 
        other.executable = self.executable
131
126
        other.symlink_target = self.symlink_target
132
127
        other.revision = self.revision
133
128
        return other
134
129
 
135
130
 
136
 
class GitInventoryTreeReference(GitInventoryEntry):
137
 
 
138
 
    _git_class = None
139
 
 
140
 
    def __init__(self, inv, parent_id, hexsha, path, basename, executable):
141
 
        super(GitInventoryTreeReference, self).__init__(inv, parent_id, hexsha, path, basename, executable)
142
 
        self.hexsha = hexsha
143
 
        self.reference_revision = inv.mapping.revision_id_foreign_to_bzr(hexsha)
144
 
        self.text_sha1 = None
145
 
        self.text_size = None
146
 
        self.symlink_target = None
147
 
        self.kind = 'tree-reference'
148
 
        self._children = None
149
 
 
150
 
    def kind_character(self):
151
 
        """See InventoryEntry.kind_character."""
152
 
        return '/'
153
 
 
154
 
 
155
131
class GitInventoryDirectory(GitInventoryEntry):
156
132
 
157
133
    _git_class = Tree
179
155
        for mode, name, hexsha in self.object.entries():
180
156
            basename = name.decode("utf-8")
181
157
            child_path = osutils.pathjoin(self.path, basename)
182
 
            if self._inventory.mapping.is_control_file(child_path):
183
 
                continue
184
 
            executable = mode_is_executable(mode)
185
 
            kind_class = {'directory': GitInventoryDirectory,
186
 
                          'file': GitInventoryFile,
187
 
                          'symlink': GitInventoryLink,
188
 
                          'tree-reference': GitInventoryTreeReference}[mode_kind(mode)]
189
 
            self._children[basename] = kind_class(self._inventory,
190
 
                self.file_id, hexsha, child_path, basename, executable)
 
158
            entry_kind = (mode & 0700000) / 0100000
 
159
            fs_mode = mode & 0777
 
160
            executable = bool(fs_mode & 0111)
 
161
            if entry_kind == 0:
 
162
                kind_class = GitInventoryDirectory
 
163
            elif entry_kind == 1:
 
164
                file_kind = (mode & 070000) / 010000
 
165
                if file_kind == 0:
 
166
                    kind_class = GitInventoryFile
 
167
                elif file_kind == 2:
 
168
                    kind_class = GitInventoryLink
 
169
                else:
 
170
                    raise AssertionError(
 
171
                        "Unknown file kind, perms=%o." % (mode,))
 
172
            else:
 
173
                raise AssertionError(
 
174
                    "Unknown blob kind, perms=%r." % (mode,))
 
175
            self._children[basename] = kind_class(self._inventory, self.file_id, hexsha, child_path, basename, executable)
191
176
 
192
177
    def copy(self):
193
 
        other = inventory.InventoryDirectory(self.file_id, self.name,
 
178
        other = inventory.InventoryDirectory(self.file_id, self.name, 
194
179
                                             self.parent_id)
195
180
        other.revision = self.revision
196
181
        # note that children are *not* copied; they're pulled across when
200
185
 
201
186
class GitInventory(inventory.Inventory):
202
187
 
203
 
    def __repr__(self):
204
 
        return "<%s for %r in %r>" % (self.__class__.__name__,
205
 
                self.root.hexsha, self.store)
206
 
 
207
 
    def __init__(self, tree_id, mapping, fileid_map, store, revision_id):
 
188
    def __init__(self, tree_id, mapping, store, revision_id):
208
189
        super(GitInventory, self).__init__(revision_id=revision_id)
209
190
        self.store = store
210
 
        self.fileid_map = fileid_map
211
191
        self.mapping = mapping
212
192
        self.root = GitInventoryDirectory(self, None, tree_id, u"", u"", False)
213
193
 
214
194
    def _get_ie(self, path):
215
 
        if path == "" or path == []:
216
 
            return self.root
217
 
        if isinstance(path, basestring):
218
 
            parts = path.split("/")
219
 
        else:
220
 
            parts = path
 
195
        parts = path.split("/")
221
196
        ie = self.root
222
197
        for name in parts:
223
 
            ie = ie.children[name]
 
198
            ie = ie.children[name] 
224
199
        return ie
225
200
 
226
201
    def has_filename(self, path):
238
213
            return False
239
214
 
240
215
    def id2path(self, file_id):
241
 
        path = self.fileid_map.lookup_path(file_id)
 
216
        path = self.mapping.parse_file_id(file_id)
242
217
        try:
243
218
            ie = self._get_ie(path)
244
219
            assert ie.path == path
254
229
    def __getitem__(self, file_id):
255
230
        if file_id == inventory.ROOT_ID:
256
231
            return self.root
257
 
        path = self.fileid_map.lookup_path(file_id)
 
232
        path = self.mapping.parse_file_id(file_id)
258
233
        try:
259
234
            return self._get_ie(path)
260
235
        except KeyError:
264
239
class GitIndexInventory(inventory.Inventory):
265
240
    """Inventory that retrieves its contents from an index file."""
266
241
 
267
 
    def __repr__(self):
268
 
        return "<%s for %r>" % (self.__class__.__name__, self.index)
269
 
 
270
 
    def __init__(self, basis_inventory, fileid_map, index, store):
271
 
        if basis_inventory is None:
272
 
            root_id = None
273
 
        else:
274
 
            root_id = basis_inventory.root.file_id
275
 
        super(GitIndexInventory, self).__init__(revision_id=None, root_id=root_id)
 
242
    def __init__(self, basis_inventory, mapping, index):
 
243
        super(GitIndexInventory, self).__init__(revision_id=None, root_id=basis_inventory.root.file_id)
276
244
        self.basis_inv = basis_inventory
277
 
        self.fileid_map = fileid_map
 
245
        self.mapping = mapping
278
246
        self.index = index
279
 
        self._contents_read = False
280
 
        self.store = store
281
 
        self.root = self.add_path("", 'directory',
282
 
            self.fileid_map.lookup_file_id(""), None)
283
 
 
284
 
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
285
 
        self._read_contents()
286
 
        return super(GitIndexInventory, self).iter_entries_by_dir(
287
 
            specific_file_ids=specific_file_ids, yield_parents=yield_parents)
288
 
 
289
 
    def has_id(self, file_id):
290
 
        if type(file_id) != str:
291
 
            raise AssertionError
292
 
        try:
293
 
            self.id2path(file_id)
294
 
            return True
295
 
        except errors.NoSuchId:
296
 
            return False
297
 
 
298
 
    def has_filename(self, path):
299
 
        if path in self.index:
300
 
            return True
301
 
        self._read_contents()
302
 
        return super(GitIndexInventory, self).has_filename(path)
303
 
 
304
 
    def id2path(self, file_id):
305
 
        if type(file_id) != str:
306
 
            raise AssertionError
307
 
        path = self.fileid_map.lookup_path(file_id)
308
 
        if path in self.index:
309
 
            return path
310
 
        self._read_contents()
311
 
        return super(GitIndexInventory, self).id2path(file_id)
312
 
 
313
 
    def path2id(self, path):
314
 
        if type(path) in (list, tuple):
315
 
            path = "/".join(path)
316
 
        if path in self.index:
317
 
            file_id = self.fileid_map.lookup_file_id(path)
318
 
        else:
319
 
            self._read_contents()
320
 
            file_id = super(GitIndexInventory, self).path2id(path)
321
 
        if file_id is not None and type(file_id) is not str:
322
 
            raise AssertionError
323
 
        return file_id
324
 
 
325
 
    def __getitem__(self, file_id):
326
 
        self._read_contents()
327
 
        return super(GitIndexInventory, self).__getitem__(file_id)
328
 
 
329
 
    def _read_contents(self):
330
 
        if self._contents_read:
331
 
            return
332
 
        self._contents_read = True
 
247
 
333
248
        pb = ui.ui_factory.nested_progress_bar()
334
249
        try:
335
250
            for i, (path, value) in enumerate(self.index.iteritems()):
336
 
                pb.update("creating working inventory from index",
 
251
                pb.update("creating working inventory from index", 
337
252
                        i, len(self.index))
338
253
                assert isinstance(path, str)
339
254
                assert isinstance(value, tuple) and len(value) == 10
340
 
                (ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
341
 
                if self.basis_inv is not None:
342
 
                    try:
343
 
                        old_ie = self.basis_inv._get_ie(path)
344
 
                    except KeyError:
345
 
                        old_ie = None
346
 
                else:
 
255
                (ctime, mtime, ino, dev, mode, uid, gid, size, sha, flags) = value
 
256
                try:
 
257
                    old_ie = self.basis_inv._get_ie(path)
 
258
                except KeyError:
347
259
                    old_ie = None
348
260
                if old_ie is None:
349
 
                    file_id = self.fileid_map.lookup_file_id(path)
 
261
                    file_id = self.mapping.generate_file_id(path)
350
262
                else:
351
263
                    file_id = old_ie.file_id
352
 
                if type(file_id) != str:
353
 
                    raise AssertionError
354
 
                kind = mode_kind(mode)
 
264
                if stat.S_ISLNK(mode):
 
265
                    kind = 'symlink'
 
266
                else:
 
267
                    assert stat.S_ISREG(mode)
 
268
                    kind = 'file'
355
269
                if old_ie is not None and old_ie.hexsha == sha:
356
270
                    # Hasn't changed since basis inv
357
271
                    self.add_parents(path)
358
272
                    self.add(old_ie)
359
273
                else:
360
 
                    ie = self.add_path(path, kind, file_id,
361
 
                        self.add_parents(path))
362
 
                    data = self.store[sha].data
363
 
                    if kind == "symlink":
364
 
                        ie.symlink_target = data
365
 
                    else:
366
 
                        ie.text_sha1 = osutils.sha_string(data)
367
 
                        ie.text_size = len(data)
 
274
                    ie = self.add_path(path, kind, file_id, self.add_parents(path))
368
275
                    ie.revision = None
369
276
        finally:
370
277
            pb.finished()
371
278
 
372
279
    def add_parents(self, path):
373
280
        dirname, _ = osutils.split(path)
374
 
        file_id = super(GitIndexInventory, self).path2id(dirname)
 
281
        file_id = self.path2id(dirname)
375
282
        if file_id is None:
376
283
            if dirname == "":
377
284
                parent_fid = None
378
285
            else:
379
286
                parent_fid = self.add_parents(dirname)
380
 
            ie = self.add_path(dirname, 'directory',
381
 
                    self.fileid_map.lookup_file_id(dirname), parent_fid)
382
 
            if self.basis_inv is not None and ie.file_id in self.basis_inv:
 
287
            ie = self.add_path(dirname, 'directory', 
 
288
                    self.mapping.generate_file_id(dirname), parent_fid)
 
289
            if ie.file_id in self.basis_inv:
383
290
                ie.revision = self.basis_inv[ie.file_id].revision
384
291
            file_id = ie.file_id
385
 
        if type(file_id) != str:
386
 
            raise AssertionError
387
292
        return file_id
388
293