/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

More work on roundtrip push support.

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.fileid_map.lookup_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
79
76
 
80
77
    @property
81
78
    def text_sha1(self):
82
 
        return osutils.sha_string(self.object.data)
 
79
        return osutils.sha_strings(self.object.chunked)
83
80
 
84
81
    @property
85
82
    def text_size(self):
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
178
179
        for mode, name, hexsha in self.object.entries():
179
180
            basename = name.decode("utf-8")
180
181
            child_path = osutils.pathjoin(self.path, basename)
 
182
            if self._inventory.mapping.is_control_file(child_path):
 
183
                continue
181
184
            executable = mode_is_executable(mode)
182
185
            kind_class = {'directory': GitInventoryDirectory,
183
186
                          'file': GitInventoryFile,
184
187
                          'symlink': GitInventoryLink,
185
188
                          'tree-reference': GitInventoryTreeReference}[mode_kind(mode)]
186
 
            self._children[basename] = kind_class(self._inventory, self.file_id, hexsha, child_path, basename, executable)
 
189
            self._children[basename] = kind_class(self._inventory,
 
190
                self.file_id, hexsha, child_path, basename, executable)
187
191
 
188
192
    def copy(self):
189
 
        other = inventory.InventoryDirectory(self.file_id, self.name, 
 
193
        other = inventory.InventoryDirectory(self.file_id, self.name,
190
194
                                             self.parent_id)
191
195
        other.revision = self.revision
192
196
        # note that children are *not* copied; they're pulled across when
196
200
 
197
201
class GitInventory(inventory.Inventory):
198
202
 
199
 
    def __init__(self, tree_id, mapping, store, revision_id):
 
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):
200
208
        super(GitInventory, self).__init__(revision_id=revision_id)
201
209
        self.store = store
 
210
        self.fileid_map = fileid_map
202
211
        self.mapping = mapping
203
212
        self.root = GitInventoryDirectory(self, None, tree_id, u"", u"", False)
204
213
 
205
214
    def _get_ie(self, path):
206
 
        if path == "":
 
215
        if path == "" or path == []:
207
216
            return self.root
208
 
        parts = path.split("/")
 
217
        if isinstance(path, basestring):
 
218
            parts = path.split("/")
 
219
        else:
 
220
            parts = path
209
221
        ie = self.root
210
222
        for name in parts:
211
 
            ie = ie.children[name] 
 
223
            ie = ie.children[name]
212
224
        return ie
213
225
 
214
226
    def has_filename(self, path):
226
238
            return False
227
239
 
228
240
    def id2path(self, file_id):
229
 
        path = self.mapping.parse_file_id(file_id)
 
241
        path = self.fileid_map.lookup_path(file_id)
230
242
        try:
231
243
            ie = self._get_ie(path)
232
244
            assert ie.path == path
242
254
    def __getitem__(self, file_id):
243
255
        if file_id == inventory.ROOT_ID:
244
256
            return self.root
245
 
        path = self.mapping.parse_file_id(file_id)
 
257
        path = self.fileid_map.lookup_path(file_id)
246
258
        try:
247
259
            return self._get_ie(path)
248
260
        except KeyError:
252
264
class GitIndexInventory(inventory.Inventory):
253
265
    """Inventory that retrieves its contents from an index file."""
254
266
 
255
 
    def __init__(self, basis_inventory, mapping, index, store):
256
 
        super(GitIndexInventory, self).__init__(revision_id=None, root_id=basis_inventory.root.file_id)
 
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)
257
276
        self.basis_inv = basis_inventory
258
 
        self.mapping = mapping
 
277
        self.fileid_map = fileid_map
259
278
        self.index = index
260
 
 
 
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
261
333
        pb = ui.ui_factory.nested_progress_bar()
262
334
        try:
263
335
            for i, (path, value) in enumerate(self.index.iteritems()):
264
 
                pb.update("creating working inventory from index", 
 
336
                pb.update("creating working inventory from index",
265
337
                        i, len(self.index))
266
338
                assert isinstance(path, str)
267
339
                assert isinstance(value, tuple) and len(value) == 10
268
340
                (ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
269
 
                try:
270
 
                    old_ie = self.basis_inv._get_ie(path)
271
 
                except KeyError:
 
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:
272
347
                    old_ie = None
273
348
                if old_ie is None:
274
 
                    file_id = self.mapping.generate_file_id(path)
 
349
                    file_id = self.fileid_map.lookup_file_id(path)
275
350
                else:
276
351
                    file_id = old_ie.file_id
 
352
                if type(file_id) != str:
 
353
                    raise AssertionError
277
354
                kind = mode_kind(mode)
278
355
                if old_ie is not None and old_ie.hexsha == sha:
279
356
                    # Hasn't changed since basis inv
280
357
                    self.add_parents(path)
281
358
                    self.add(old_ie)
282
359
                else:
283
 
                    ie = self.add_path(path, kind, file_id, self.add_parents(path))
284
 
                    data = store[sha].data
 
360
                    ie = self.add_path(path, kind, file_id,
 
361
                        self.add_parents(path))
 
362
                    data = self.store[sha].data
285
363
                    if kind == "symlink":
286
364
                        ie.symlink_target = data
287
365
                    else:
293
371
 
294
372
    def add_parents(self, path):
295
373
        dirname, _ = osutils.split(path)
296
 
        file_id = self.path2id(dirname)
 
374
        file_id = super(GitIndexInventory, self).path2id(dirname)
297
375
        if file_id is None:
298
376
            if dirname == "":
299
377
                parent_fid = None
300
378
            else:
301
379
                parent_fid = self.add_parents(dirname)
302
 
            ie = self.add_path(dirname, 'directory', 
303
 
                    self.mapping.generate_file_id(dirname), parent_fid)
304
 
            if ie.file_id in self.basis_inv:
 
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:
305
383
                ie.revision = self.basis_inv[ie.file_id].revision
306
384
            file_id = ie.file_id
 
385
        if type(file_id) != str:
 
386
            raise AssertionError
307
387
        return file_id
308
388