/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

Simplify index handling a bit more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
inventory.py
265
265
                        i, len(self.index))
266
266
                assert isinstance(path, str)
267
267
                assert isinstance(value, tuple) and len(value) == 10
268
 
                (ctime, mtime, ino, dev, mode, uid, gid, size, sha, flags) = value
 
268
                (ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
269
269
                try:
270
270
                    old_ie = self.basis_inv._get_ie(path)
271
271
                except KeyError:
274
274
                    file_id = self.mapping.generate_file_id(path)
275
275
                else:
276
276
                    file_id = old_ie.file_id
277
 
                if stat.S_ISLNK(mode):
278
 
                    kind = 'symlink'
279
 
                elif S_ISGITLINK(mode):
280
 
                    kind = 'tree-reference'
281
 
                else:
282
 
                    assert stat.S_ISREG(mode)
283
 
                    kind = 'file'
 
277
                kind = mode_kind(mode)
284
278
                if old_ie is not None and old_ie.hexsha == sha:
285
279
                    # Hasn't changed since basis inv
286
280
                    self.add_parents(path)