/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

Merge fixes for SHA1s of symlinks.

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
 
 
24
21
from dulwich.objects import (
25
 
    S_ISGITLINK,
26
22
    Blob,
27
23
    Tree,
28
24
    )
33
29
    inventory,
34
30
    osutils,
35
31
    ui,
36
 
    urlutils,
37
32
    )
38
33
 
39
34
from bzrlib.plugins.git.mapping import (
72
67
    _git_class = Blob
73
68
 
74
69
    def __init__(self, inv, parent_id, hexsha, path, basename, executable):
75
 
        super(GitInventoryFile, self).__init__(inv, parent_id, hexsha, path, basename, executable)
 
70
        super(GitInventoryFile, self).__init__(inv, parent_id, hexsha, path,
 
71
            basename, executable)
76
72
        self.kind = 'file'
77
73
        self.text_id = None
78
74
        self.symlink_target = None
100
96
        return ''
101
97
 
102
98
    def copy(self):
103
 
        other = inventory.InventoryFile(self.file_id, self.name, self.parent_id)
 
99
        other = inventory.InventoryFile(self.file_id, self.name,
 
100
            self.parent_id)
104
101
        other.executable = self.executable
105
102
        other.text_id = self.text_id
106
103
        other.text_sha1 = self.text_sha1
140
137
 
141
138
    def __init__(self, inv, parent_id, hexsha, path, basename, executable):
142
139
        super(GitInventoryTreeReference, self).__init__(inv, parent_id, hexsha, path, basename, executable)
 
140
        self.hexsha = hexsha
 
141
        self.reference_revision = inv.mapping.revision_id_foreign_to_bzr(hexsha)
143
142
        self.text_sha1 = None
144
143
        self.text_size = None
145
144
        self.symlink_target = None
186
185
            self._children[basename] = kind_class(self._inventory, self.file_id, hexsha, child_path, basename, executable)
187
186
 
188
187
    def copy(self):
189
 
        other = inventory.InventoryDirectory(self.file_id, self.name, 
 
188
        other = inventory.InventoryDirectory(self.file_id, self.name,
190
189
                                             self.parent_id)
191
190
        other.revision = self.revision
192
191
        # note that children are *not* copied; they're pulled across when
208
207
        parts = path.split("/")
209
208
        ie = self.root
210
209
        for name in parts:
211
 
            ie = ie.children[name] 
 
210
            ie = ie.children[name]
212
211
        return ie
213
212
 
214
213
    def has_filename(self, path):
257
256
        self.basis_inv = basis_inventory
258
257
        self.mapping = mapping
259
258
        self.index = index
260
 
 
 
259
        self._contents_read = False
 
260
        self.root = self.add_path("", 'directory',
 
261
            self.mapping.generate_file_id(""), None)
 
262
 
 
263
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
 
264
        self._read_contents()
 
265
        return super(GitIndexInventory, self).iter_entries_by_dir(specific_file_ids=specific_file_ids, yield_parents=yield_parents)
 
266
 
 
267
    def has_id(self, file_id):
 
268
        try:
 
269
            self.id2path(file_id)
 
270
            return True
 
271
        except errors.NoSuchId:
 
272
            return False
 
273
 
 
274
    def has_filename(self, path):
 
275
        if path in self.index:
 
276
            return True
 
277
        self._read_contents()
 
278
        return super(GitIndexInventory, self).has_filename(path)
 
279
 
 
280
    def id2path(self, file_id):
 
281
        path = self.mapping.parse_file_id(file_id)
 
282
        if path in self.index:
 
283
            return path
 
284
        self._read_contents()
 
285
        return super(GitIndexInventory, self).id2path(file_id)
 
286
 
 
287
    def path2id(self, path):
 
288
        if path in self.index:
 
289
            return self.mapping.generate_file_id(path)
 
290
        self._read_contents()
 
291
        return super(GitIndexInventory, self).path2id(path)
 
292
 
 
293
    def __getitem__(self, file_id):
 
294
        self._read_contents()
 
295
        return super(GitIndexInventory, self).__getitem__(file_id)
 
296
 
 
297
    def _read_contents(self):
 
298
        if self._contents_read:
 
299
            return
 
300
        self._contents_read = True
261
301
        pb = ui.ui_factory.nested_progress_bar()
262
302
        try:
263
303
            for i, (path, value) in enumerate(self.index.iteritems()):
264
 
                pb.update("creating working inventory from index", 
 
304
                pb.update("creating working inventory from index",
265
305
                        i, len(self.index))
266
306
                assert isinstance(path, str)
267
307
                assert isinstance(value, tuple) and len(value) == 10
280
320
                    self.add_parents(path)
281
321
                    self.add(old_ie)
282
322
                else:
283
 
                    ie = self.add_path(path, kind, file_id, self.add_parents(path))
 
323
                    ie = self.add_path(path, kind, file_id,
 
324
                        self.add_parents(path))
284
325
                    data = store[sha].data
285
326
                    if kind == "symlink":
286
327
                        ie.symlink_target = data
293
334
 
294
335
    def add_parents(self, path):
295
336
        dirname, _ = osutils.split(path)
296
 
        file_id = self.path2id(dirname)
 
337
        file_id = super(GitIndexInventory, self).path2id(dirname)
297
338
        if file_id is None:
298
339
            if dirname == "":
299
340
                parent_fid = None
300
341
            else:
301
342
                parent_fid = self.add_parents(dirname)
302
 
            ie = self.add_path(dirname, 'directory', 
 
343
            ie = self.add_path(dirname, 'directory',
303
344
                    self.mapping.generate_file_id(dirname), parent_fid)
304
345
            if ie.file_id in self.basis_inv:
305
346
                ie.revision = self.basis_inv[ie.file_id].revision