/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 supporting roundtripping push.

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
 
21
from dulwich.objects import (
 
22
    Blob,
 
23
    Tree,
 
24
    )
22
25
 
23
26
 
24
27
from bzrlib import (
26
29
    inventory,
27
30
    osutils,
28
31
    ui,
29
 
    urlutils,
 
32
    )
 
33
 
 
34
from bzrlib.plugins.git.mapping import (
 
35
    mode_kind,
 
36
    mode_is_executable,
30
37
    )
31
38
 
32
39
 
33
40
class GitInventoryEntry(inventory.InventoryEntry):
34
41
 
 
42
    _git_class = None
 
43
 
35
44
    def __init__(self, inv, parent_id, hexsha, path, name, executable):
36
45
        self.name = name
37
46
        self.parent_id = parent_id
41
50
        self.path = path
42
51
        self.revision = self._inventory.revision_id
43
52
        self.executable = executable
44
 
        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'))
45
55
 
46
56
    @property
47
57
    def object(self):
48
58
        if self._object is None:
49
59
            self._object = self._inventory.store[self.hexsha]
 
60
            assert isinstance(self._object, self._git_class), \
 
61
                    "Expected instance of %r, got %r" % \
 
62
                    (self._git_class, self._object)
50
63
        return self._object
51
64
 
52
65
 
53
66
class GitInventoryFile(GitInventoryEntry):
54
67
 
 
68
    _git_class = Blob
 
69
 
55
70
    def __init__(self, inv, parent_id, hexsha, path, basename, executable):
56
 
        super(GitInventoryFile, self).__init__(inv, parent_id, hexsha, path, basename, executable)
 
71
        super(GitInventoryFile, self).__init__(inv, parent_id, hexsha, path,
 
72
            basename, executable)
57
73
        self.kind = 'file'
58
74
        self.text_id = None
59
75
        self.symlink_target = None
60
76
 
61
77
    @property
62
78
    def text_sha1(self):
63
 
        return osutils.sha_string(self.object.data)
 
79
        return osutils.sha_strings(self.object.chunked)
64
80
 
65
81
    @property
66
82
    def text_size(self):
81
97
        return ''
82
98
 
83
99
    def copy(self):
84
 
        other = inventory.InventoryFile(self.file_id, self.name, self.parent_id)
 
100
        other = inventory.InventoryFile(self.file_id, self.name,
 
101
            self.parent_id)
85
102
        other.executable = self.executable
86
103
        other.text_id = self.text_id
87
104
        other.text_sha1 = self.text_sha1
92
109
 
93
110
class GitInventoryLink(GitInventoryEntry):
94
111
 
 
112
    _git_class = Blob
 
113
 
95
114
    def __init__(self, inv, parent_id, hexsha, path, basename, executable):
96
115
        super(GitInventoryLink, self).__init__(inv, parent_id, hexsha, path, basename, executable)
97
116
        self.text_sha1 = None
108
127
 
109
128
    def copy(self):
110
129
        other = inventory.InventoryLink(self.file_id, self.name, self.parent_id)
 
130
        other.executable = self.executable
111
131
        other.symlink_target = self.symlink_target
112
132
        other.revision = self.revision
113
133
        return other
114
134
 
115
135
 
 
136
class GitInventoryTreeReference(GitInventoryEntry):
 
137
 
 
138
    _git_class = None
 
139
 
 
140
    def __init__(self, inv, parent_id, hexsha, path, basename, executable):
 
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)
 
144
        self.text_sha1 = None
 
145
        self.text_size = None
 
146
        self.symlink_target = None
 
147
        self.kind = 'tree-reference'
 
148
        self._children = None
 
149
 
 
150
    def kind_character(self):
 
151
        """See InventoryEntry.kind_character."""
 
152
        return '/'
 
153
 
 
154
 
116
155
class GitInventoryDirectory(GitInventoryEntry):
117
156
 
 
157
    _git_class = Tree
 
158
 
118
159
    def __init__(self, inv, parent_id, hexsha, path, basename, executable):
119
160
        super(GitInventoryDirectory, self).__init__(inv, parent_id, hexsha, path, basename, executable)
120
161
        self.text_sha1 = None
138
179
        for mode, name, hexsha in self.object.entries():
139
180
            basename = name.decode("utf-8")
140
181
            child_path = osutils.pathjoin(self.path, basename)
141
 
            entry_kind = (mode & 0700000) / 0100000
142
 
            fs_mode = mode & 0777
143
 
            executable = bool(fs_mode & 0111)
144
 
            if entry_kind == 0:
145
 
                kind_class = GitInventoryDirectory
146
 
            elif entry_kind == 1:
147
 
                file_kind = (mode & 070000) / 010000
148
 
                if file_kind == 0:
149
 
                    kind_class = GitInventoryFile
150
 
                elif file_kind == 2:
151
 
                    kind_class = GitInventoryLink
152
 
                else:
153
 
                    raise AssertionError(
154
 
                        "Unknown file kind, perms=%o." % (mode,))
155
 
            else:
156
 
                raise AssertionError(
157
 
                    "Unknown blob kind, perms=%r." % (mode,))
158
 
            self._children[basename] = kind_class(self._inventory, self.file_id, hexsha, child_path, basename, executable)
 
182
            if self._inventory.mapping.is_control_file(child_path):
 
183
                continue
 
184
            executable = mode_is_executable(mode)
 
185
            kind_class = {'directory': GitInventoryDirectory,
 
186
                          'file': GitInventoryFile,
 
187
                          'symlink': GitInventoryLink,
 
188
                          'tree-reference': GitInventoryTreeReference}[mode_kind(mode)]
 
189
            self._children[basename] = kind_class(self._inventory,
 
190
                self.file_id, hexsha, child_path, basename, executable)
159
191
 
160
192
    def copy(self):
161
 
        other = inventory.InventoryDirectory(self.file_id, self.name, 
 
193
        other = inventory.InventoryDirectory(self.file_id, self.name,
162
194
                                             self.parent_id)
163
195
        other.revision = self.revision
164
196
        # note that children are *not* copied; they're pulled across when
168
200
 
169
201
class GitInventory(inventory.Inventory):
170
202
 
171
 
    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):
172
208
        super(GitInventory, self).__init__(revision_id=revision_id)
173
209
        self.store = store
 
210
        self.fileid_map = fileid_map
174
211
        self.mapping = mapping
175
212
        self.root = GitInventoryDirectory(self, None, tree_id, u"", u"", False)
176
213
 
177
214
    def _get_ie(self, path):
178
 
        parts = path.split("/")
 
215
        if path == "" or path == []:
 
216
            return self.root
 
217
        if isinstance(path, basestring):
 
218
            parts = path.split("/")
 
219
        else:
 
220
            parts = path
179
221
        ie = self.root
180
222
        for name in parts:
181
 
            ie = ie.children[name] 
 
223
            ie = ie.children[name]
182
224
        return ie
183
225
 
184
226
    def has_filename(self, path):
196
238
            return False
197
239
 
198
240
    def id2path(self, file_id):
199
 
        path = self.mapping.parse_file_id(file_id)
 
241
        path = self.fileid_map.lookup_path(file_id)
200
242
        try:
201
243
            ie = self._get_ie(path)
202
244
            assert ie.path == path
212
254
    def __getitem__(self, file_id):
213
255
        if file_id == inventory.ROOT_ID:
214
256
            return self.root
215
 
        path = self.mapping.parse_file_id(file_id)
 
257
        path = self.fileid_map.lookup_path(file_id)
216
258
        try:
217
259
            return self._get_ie(path)
218
260
        except KeyError:
222
264
class GitIndexInventory(inventory.Inventory):
223
265
    """Inventory that retrieves its contents from an index file."""
224
266
 
225
 
    def __init__(self, basis_inventory, mapping, index):
226
 
        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)
227
276
        self.basis_inv = basis_inventory
228
 
        self.mapping = mapping
 
277
        self.fileid_map = fileid_map
229
278
        self.index = index
230
 
 
 
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
231
333
        pb = ui.ui_factory.nested_progress_bar()
232
334
        try:
233
335
            for i, (path, value) in enumerate(self.index.iteritems()):
234
 
                pb.update("creating working inventory from index", 
 
336
                pb.update("creating working inventory from index",
235
337
                        i, len(self.index))
236
338
                assert isinstance(path, str)
237
339
                assert isinstance(value, tuple) and len(value) == 10
238
 
                (ctime, mtime, ino, dev, mode, uid, gid, size, sha, flags) = value
239
 
                try:
240
 
                    old_ie = self.basis_inv._get_ie(path)
241
 
                except KeyError:
 
340
                (ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
 
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:
242
347
                    old_ie = None
243
348
                if old_ie is None:
244
 
                    file_id = self.mapping.generate_file_id(path)
 
349
                    file_id = self.fileid_map.lookup_file_id(path)
245
350
                else:
246
351
                    file_id = old_ie.file_id
247
 
                if stat.S_ISLNK(mode):
248
 
                    kind = 'symlink'
249
 
                else:
250
 
                    assert stat.S_ISREG(mode)
251
 
                    kind = 'file'
 
352
                if type(file_id) != str:
 
353
                    raise AssertionError
 
354
                kind = mode_kind(mode)
252
355
                if old_ie is not None and old_ie.hexsha == sha:
253
356
                    # Hasn't changed since basis inv
254
357
                    self.add_parents(path)
255
358
                    self.add(old_ie)
256
359
                else:
257
 
                    ie = self.add_path(path, kind, file_id, self.add_parents(path))
 
360
                    ie = self.add_path(path, kind, file_id,
 
361
                        self.add_parents(path))
 
362
                    data = self.store[sha].data
 
363
                    if kind == "symlink":
 
364
                        ie.symlink_target = data
 
365
                    else:
 
366
                        ie.text_sha1 = osutils.sha_string(data)
 
367
                        ie.text_size = len(data)
258
368
                    ie.revision = None
259
369
        finally:
260
370
            pb.finished()
261
371
 
262
372
    def add_parents(self, path):
263
373
        dirname, _ = osutils.split(path)
264
 
        file_id = self.path2id(dirname)
 
374
        file_id = super(GitIndexInventory, self).path2id(dirname)
265
375
        if file_id is None:
266
376
            if dirname == "":
267
377
                parent_fid = None
268
378
            else:
269
379
                parent_fid = self.add_parents(dirname)
270
 
            ie = self.add_path(dirname, 'directory', 
271
 
                    self.mapping.generate_file_id(dirname), parent_fid)
272
 
            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:
273
383
                ie.revision = self.basis_inv[ie.file_id].revision
274
384
            file_id = ie.file_id
 
385
        if type(file_id) != str:
 
386
            raise AssertionError
275
387
        return file_id
276
388