/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

Add tests for revspec.

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 (
55
50
        self.path = path
56
51
        self.revision = self._inventory.revision_id
57
52
        self.executable = executable
58
 
        self.file_id = self._inventory.mapping.generate_file_id(path.encode('utf-8'))
 
53
        self.file_id = self._inventory.mapping.generate_file_id(
 
54
            path.encode('utf-8'))
59
55
 
60
56
    @property
61
57
    def object(self):
72
68
    _git_class = Blob
73
69
 
74
70
    def __init__(self, inv, parent_id, hexsha, path, basename, executable):
75
 
        super(GitInventoryFile, self).__init__(inv, parent_id, hexsha, path, basename, executable)
 
71
        super(GitInventoryFile, self).__init__(inv, parent_id, hexsha, path,
 
72
            basename, executable)
76
73
        self.kind = 'file'
77
74
        self.text_id = None
78
75
        self.symlink_target = None
100
97
        return ''
101
98
 
102
99
    def copy(self):
103
 
        other = inventory.InventoryFile(self.file_id, self.name, self.parent_id)
 
100
        other = inventory.InventoryFile(self.file_id, self.name,
 
101
            self.parent_id)
104
102
        other.executable = self.executable
105
103
        other.text_id = self.text_id
106
104
        other.text_sha1 = self.text_sha1
129
127
 
130
128
    def copy(self):
131
129
        other = inventory.InventoryLink(self.file_id, self.name, self.parent_id)
 
130
        other.executable = self.executable
132
131
        other.symlink_target = self.symlink_target
133
132
        other.revision = self.revision
134
133
        return other
140
139
 
141
140
    def __init__(self, inv, parent_id, hexsha, path, basename, executable):
142
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)
143
144
        self.text_sha1 = None
144
145
        self.text_size = None
145
146
        self.symlink_target = None
183
184
                          'file': GitInventoryFile,
184
185
                          'symlink': GitInventoryLink,
185
186
                          'tree-reference': GitInventoryTreeReference}[mode_kind(mode)]
186
 
            self._children[basename] = kind_class(self._inventory, self.file_id, hexsha, child_path, basename, executable)
 
187
            self._children[basename] = kind_class(self._inventory,
 
188
                self.file_id, hexsha, child_path, basename, executable)
187
189
 
188
190
    def copy(self):
189
 
        other = inventory.InventoryDirectory(self.file_id, self.name, 
 
191
        other = inventory.InventoryDirectory(self.file_id, self.name,
190
192
                                             self.parent_id)
191
193
        other.revision = self.revision
192
194
        # note that children are *not* copied; they're pulled across when
208
210
        parts = path.split("/")
209
211
        ie = self.root
210
212
        for name in parts:
211
 
            ie = ie.children[name] 
 
213
            ie = ie.children[name]
212
214
        return ie
213
215
 
214
216
    def has_filename(self, path):
257
259
        self.basis_inv = basis_inventory
258
260
        self.mapping = mapping
259
261
        self.index = index
260
 
 
 
262
        self._contents_read = False
 
263
        self.store = store
 
264
        self.root = self.add_path("", 'directory',
 
265
            self.mapping.generate_file_id(""), None)
 
266
 
 
267
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
 
268
        self._read_contents()
 
269
        return super(GitIndexInventory, self).iter_entries_by_dir(
 
270
            specific_file_ids=specific_file_ids, yield_parents=yield_parents)
 
271
 
 
272
    def has_id(self, file_id):
 
273
        if type(file_id) != str:
 
274
            raise AssertionError
 
275
        try:
 
276
            self.id2path(file_id)
 
277
            return True
 
278
        except errors.NoSuchId:
 
279
            return False
 
280
 
 
281
    def has_filename(self, path):
 
282
        if path in self.index:
 
283
            return True
 
284
        self._read_contents()
 
285
        return super(GitIndexInventory, self).has_filename(path)
 
286
 
 
287
    def id2path(self, file_id):
 
288
        if type(file_id) != str:
 
289
            raise AssertionError
 
290
        path = self.mapping.parse_file_id(file_id)
 
291
        if path in self.index:
 
292
            return path
 
293
        self._read_contents()
 
294
        return super(GitIndexInventory, self).id2path(file_id)
 
295
 
 
296
    def path2id(self, path):
 
297
        if path in self.index:
 
298
            return self.mapping.generate_file_id(path)
 
299
        self._read_contents()
 
300
        return super(GitIndexInventory, self).path2id(path)
 
301
 
 
302
    def __getitem__(self, file_id):
 
303
        self._read_contents()
 
304
        return super(GitIndexInventory, self).__getitem__(file_id)
 
305
 
 
306
    def _read_contents(self):
 
307
        if self._contents_read:
 
308
            return
 
309
        self._contents_read = True
261
310
        pb = ui.ui_factory.nested_progress_bar()
262
311
        try:
263
312
            for i, (path, value) in enumerate(self.index.iteritems()):
264
 
                pb.update("creating working inventory from index", 
 
313
                pb.update("creating working inventory from index",
265
314
                        i, len(self.index))
266
315
                assert isinstance(path, str)
267
316
                assert isinstance(value, tuple) and len(value) == 10
274
323
                    file_id = self.mapping.generate_file_id(path)
275
324
                else:
276
325
                    file_id = old_ie.file_id
 
326
                if type(file_id) != str:
 
327
                    raise AssertionError
277
328
                kind = mode_kind(mode)
278
329
                if old_ie is not None and old_ie.hexsha == sha:
279
330
                    # Hasn't changed since basis inv
280
331
                    self.add_parents(path)
281
332
                    self.add(old_ie)
282
333
                else:
283
 
                    ie = self.add_path(path, kind, file_id, self.add_parents(path))
284
 
                    data = store[sha].data
 
334
                    ie = self.add_path(path, kind, file_id,
 
335
                        self.add_parents(path))
 
336
                    data = self.store[sha].data
285
337
                    if kind == "symlink":
286
338
                        ie.symlink_target = data
287
339
                    else:
293
345
 
294
346
    def add_parents(self, path):
295
347
        dirname, _ = osutils.split(path)
296
 
        file_id = self.path2id(dirname)
 
348
        file_id = super(GitIndexInventory, self).path2id(dirname)
297
349
        if file_id is None:
298
350
            if dirname == "":
299
351
                parent_fid = None
300
352
            else:
301
353
                parent_fid = self.add_parents(dirname)
302
 
            ie = self.add_path(dirname, 'directory', 
 
354
            ie = self.add_path(dirname, 'directory',
303
355
                    self.mapping.generate_file_id(dirname), parent_fid)
304
356
            if ie.file_id in self.basis_inv:
305
357
                ie.revision = self.basis_inv[ie.file_id].revision
306
358
            file_id = ie.file_id
 
359
        if type(file_id) != str:
 
360
            raise AssertionError
307
361
        return file_id
308
362