/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

Clean up trailing whitespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
inventory.py
50
50
        self.path = path
51
51
        self.revision = self._inventory.revision_id
52
52
        self.executable = executable
53
 
        self.file_id = self._inventory.mapping.generate_file_id(
54
 
            path.encode('utf-8'))
 
53
        self.file_id = self._inventory.mapping.generate_file_id(path.encode('utf-8'))
55
54
 
56
55
    @property
57
56
    def object(self):
76
75
 
77
76
    @property
78
77
    def text_sha1(self):
79
 
        return osutils.sha_strings(self.object.chunked)
 
78
        return osutils.sha_string(self.object.data)
80
79
 
81
80
    @property
82
81
    def text_size(self):
127
126
 
128
127
    def copy(self):
129
128
        other = inventory.InventoryLink(self.file_id, self.name, self.parent_id)
130
 
        other.executable = self.executable
131
129
        other.symlink_target = self.symlink_target
132
130
        other.revision = self.revision
133
131
        return other
184
182
                          'file': GitInventoryFile,
185
183
                          'symlink': GitInventoryLink,
186
184
                          'tree-reference': GitInventoryTreeReference}[mode_kind(mode)]
187
 
            self._children[basename] = kind_class(self._inventory,
188
 
                self.file_id, hexsha, child_path, basename, executable)
 
185
            self._children[basename] = kind_class(self._inventory, self.file_id, hexsha, child_path, basename, executable)
189
186
 
190
187
    def copy(self):
191
188
        other = inventory.InventoryDirectory(self.file_id, self.name,
260
257
        self.mapping = mapping
261
258
        self.index = index
262
259
        self._contents_read = False
263
 
        self.store = store
264
260
        self.root = self.add_path("", 'directory',
265
261
            self.mapping.generate_file_id(""), None)
266
262
 
267
263
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
268
264
        self._read_contents()
269
 
        return super(GitIndexInventory, self).iter_entries_by_dir(
270
 
            specific_file_ids=specific_file_ids, yield_parents=yield_parents)
 
265
        return super(GitIndexInventory, self).iter_entries_by_dir(specific_file_ids=specific_file_ids, yield_parents=yield_parents)
271
266
 
272
267
    def has_id(self, file_id):
273
 
        if type(file_id) != str:
274
 
            raise AssertionError
275
268
        try:
276
269
            self.id2path(file_id)
277
270
            return True
285
278
        return super(GitIndexInventory, self).has_filename(path)
286
279
 
287
280
    def id2path(self, file_id):
288
 
        if type(file_id) != str:
289
 
            raise AssertionError
290
281
        path = self.mapping.parse_file_id(file_id)
291
282
        if path in self.index:
292
283
            return path
323
314
                    file_id = self.mapping.generate_file_id(path)
324
315
                else:
325
316
                    file_id = old_ie.file_id
326
 
                if type(file_id) != str:
327
 
                    raise AssertionError
328
317
                kind = mode_kind(mode)
329
318
                if old_ie is not None and old_ie.hexsha == sha:
330
319
                    # Hasn't changed since basis inv
333
322
                else:
334
323
                    ie = self.add_path(path, kind, file_id,
335
324
                        self.add_parents(path))
336
 
                    data = self.store[sha].data
 
325
                    data = store[sha].data
337
326
                    if kind == "symlink":
338
327
                        ie.symlink_target = data
339
328
                    else:
356
345
            if ie.file_id in self.basis_inv:
357
346
                ie.revision = self.basis_inv[ie.file_id].revision
358
347
            file_id = ie.file_id
359
 
        if type(file_id) != str:
360
 
            raise AssertionError
361
348
        return file_id
362
349