/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

  • Committer: Jelmer Vernooij
  • Date: 2010-06-28 22:30:34 UTC
  • mto: (0.200.953 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100628223034-vylrgdyakmqoupl6
use transport repo objects even for local access.

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
22
    Blob,
26
23
    Tree,
32
29
    inventory,
33
30
    osutils,
34
31
    ui,
35
 
    urlutils,
 
32
    )
 
33
 
 
34
from bzrlib.plugins.git.mapping import (
 
35
    mode_kind,
 
36
    mode_is_executable,
36
37
    )
37
38
 
38
39
 
49
50
        self.path = path
50
51
        self.revision = self._inventory.revision_id
51
52
        self.executable = executable
52
 
        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'))
53
55
 
54
56
    @property
55
57
    def object(self):
66
68
    _git_class = Blob
67
69
 
68
70
    def __init__(self, inv, parent_id, hexsha, path, basename, executable):
69
 
        super(GitInventoryFile, self).__init__(inv, parent_id, hexsha, path, basename, executable)
 
71
        super(GitInventoryFile, self).__init__(inv, parent_id, hexsha, path,
 
72
            basename, executable)
70
73
        self.kind = 'file'
71
74
        self.text_id = None
72
75
        self.symlink_target = None
73
76
 
74
77
    @property
75
78
    def text_sha1(self):
76
 
        return osutils.sha_string(self.object.data)
 
79
        return osutils.sha_strings(self.object.chunked)
77
80
 
78
81
    @property
79
82
    def text_size(self):
94
97
        return ''
95
98
 
96
99
    def copy(self):
97
 
        other = inventory.InventoryFile(self.file_id, self.name, self.parent_id)
 
100
        other = inventory.InventoryFile(self.file_id, self.name,
 
101
            self.parent_id)
98
102
        other.executable = self.executable
99
103
        other.text_id = self.text_id
100
104
        other.text_sha1 = self.text_sha1
123
127
 
124
128
    def copy(self):
125
129
        other = inventory.InventoryLink(self.file_id, self.name, self.parent_id)
 
130
        other.executable = self.executable
126
131
        other.symlink_target = self.symlink_target
127
132
        other.revision = self.revision
128
133
        return other
129
134
 
130
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
 
131
155
class GitInventoryDirectory(GitInventoryEntry):
132
156
 
133
157
    _git_class = Tree
155
179
        for mode, name, hexsha in self.object.entries():
156
180
            basename = name.decode("utf-8")
157
181
            child_path = osutils.pathjoin(self.path, basename)
158
 
            entry_kind = (mode & 0700000) / 0100000
159
 
            fs_mode = mode & 0777
160
 
            executable = bool(fs_mode & 0111)
161
 
            if entry_kind == 0:
162
 
                kind_class = GitInventoryDirectory
163
 
            elif entry_kind == 1:
164
 
                file_kind = (mode & 070000) / 010000
165
 
                if file_kind == 0:
166
 
                    kind_class = GitInventoryFile
167
 
                elif file_kind == 2:
168
 
                    kind_class = GitInventoryLink
169
 
                else:
170
 
                    raise AssertionError(
171
 
                        "Unknown file kind, perms=%o." % (mode,))
172
 
            else:
173
 
                raise AssertionError(
174
 
                    "Unknown blob kind, perms=%r." % (mode,))
175
 
            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)
176
191
 
177
192
    def copy(self):
178
 
        other = inventory.InventoryDirectory(self.file_id, self.name, 
 
193
        other = inventory.InventoryDirectory(self.file_id, self.name,
179
194
                                             self.parent_id)
180
195
        other.revision = self.revision
181
196
        # note that children are *not* copied; they're pulled across when
185
200
 
186
201
class GitInventory(inventory.Inventory):
187
202
 
188
 
    def __init__(self, tree_id, mapping, store, revision_id):
 
203
    def __init__(self, tree_id, mapping, fileid_map, store, revision_id):
189
204
        super(GitInventory, self).__init__(revision_id=revision_id)
190
205
        self.store = store
 
206
        self.fileid_map = fileid_map
191
207
        self.mapping = mapping
192
208
        self.root = GitInventoryDirectory(self, None, tree_id, u"", u"", False)
193
209
 
194
210
    def _get_ie(self, path):
 
211
        if path == "":
 
212
            return self.root
195
213
        parts = path.split("/")
196
214
        ie = self.root
197
215
        for name in parts:
198
 
            ie = ie.children[name] 
 
216
            ie = ie.children[name]
199
217
        return ie
200
218
 
201
219
    def has_filename(self, path):
213
231
            return False
214
232
 
215
233
    def id2path(self, file_id):
216
 
        path = self.mapping.parse_file_id(file_id)
 
234
        path = self.fileid_map.lookup_path(file_id)
217
235
        try:
218
236
            ie = self._get_ie(path)
219
237
            assert ie.path == path
229
247
    def __getitem__(self, file_id):
230
248
        if file_id == inventory.ROOT_ID:
231
249
            return self.root
232
 
        path = self.mapping.parse_file_id(file_id)
 
250
        path = self.fileid_map.lookup_path(file_id)
233
251
        try:
234
252
            return self._get_ie(path)
235
253
        except KeyError:
239
257
class GitIndexInventory(inventory.Inventory):
240
258
    """Inventory that retrieves its contents from an index file."""
241
259
 
242
 
    def __init__(self, basis_inventory, mapping, index):
 
260
    def __init__(self, basis_inventory, fileid_map, index, store):
243
261
        super(GitIndexInventory, self).__init__(revision_id=None, root_id=basis_inventory.root.file_id)
244
262
        self.basis_inv = basis_inventory
245
 
        self.mapping = mapping
 
263
        self.fileid_map = fileid_map
246
264
        self.index = index
247
 
 
 
265
        self._contents_read = False
 
266
        self.store = store
 
267
        self.root = self.add_path("", 'directory',
 
268
            self.fileid_map.lookup_file_id(""), None)
 
269
 
 
270
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
 
271
        self._read_contents()
 
272
        return super(GitIndexInventory, self).iter_entries_by_dir(
 
273
            specific_file_ids=specific_file_ids, yield_parents=yield_parents)
 
274
 
 
275
    def has_id(self, file_id):
 
276
        if type(file_id) != str:
 
277
            raise AssertionError
 
278
        try:
 
279
            self.id2path(file_id)
 
280
            return True
 
281
        except errors.NoSuchId:
 
282
            return False
 
283
 
 
284
    def has_filename(self, path):
 
285
        if path in self.index:
 
286
            return True
 
287
        self._read_contents()
 
288
        return super(GitIndexInventory, self).has_filename(path)
 
289
 
 
290
    def id2path(self, file_id):
 
291
        if type(file_id) != str:
 
292
            raise AssertionError
 
293
        path = self.fileid_map.lookup_path(file_id)
 
294
        if path in self.index:
 
295
            return path
 
296
        self._read_contents()
 
297
        return super(GitIndexInventory, self).id2path(file_id)
 
298
 
 
299
    def path2id(self, path):
 
300
        if path in self.index:
 
301
            return self.fileid_map.lookup_file_id(path)
 
302
        self._read_contents()
 
303
        return super(GitIndexInventory, self).path2id(path)
 
304
 
 
305
    def __getitem__(self, file_id):
 
306
        self._read_contents()
 
307
        return super(GitIndexInventory, self).__getitem__(file_id)
 
308
 
 
309
    def _read_contents(self):
 
310
        if self._contents_read:
 
311
            return
 
312
        self._contents_read = True
248
313
        pb = ui.ui_factory.nested_progress_bar()
249
314
        try:
250
315
            for i, (path, value) in enumerate(self.index.iteritems()):
251
 
                pb.update("creating working inventory from index", 
 
316
                pb.update("creating working inventory from index",
252
317
                        i, len(self.index))
253
318
                assert isinstance(path, str)
254
319
                assert isinstance(value, tuple) and len(value) == 10
255
 
                (ctime, mtime, ino, dev, mode, uid, gid, size, sha, flags) = value
 
320
                (ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
256
321
                try:
257
322
                    old_ie = self.basis_inv._get_ie(path)
258
323
                except KeyError:
259
324
                    old_ie = None
260
325
                if old_ie is None:
261
 
                    file_id = self.mapping.generate_file_id(path)
 
326
                    file_id = self.fileid_map.lookup_file_id(path)
262
327
                else:
263
328
                    file_id = old_ie.file_id
264
 
                if stat.S_ISLNK(mode):
265
 
                    kind = 'symlink'
266
 
                else:
267
 
                    assert stat.S_ISREG(mode)
268
 
                    kind = 'file'
 
329
                if type(file_id) != str:
 
330
                    raise AssertionError
 
331
                kind = mode_kind(mode)
269
332
                if old_ie is not None and old_ie.hexsha == sha:
270
333
                    # Hasn't changed since basis inv
271
334
                    self.add_parents(path)
272
335
                    self.add(old_ie)
273
336
                else:
274
 
                    ie = self.add_path(path, kind, file_id, self.add_parents(path))
 
337
                    ie = self.add_path(path, kind, file_id,
 
338
                        self.add_parents(path))
 
339
                    data = self.store[sha].data
 
340
                    if kind == "symlink":
 
341
                        ie.symlink_target = data
 
342
                    else:
 
343
                        ie.text_sha1 = osutils.sha_string(data)
 
344
                        ie.text_size = len(data)
275
345
                    ie.revision = None
276
346
        finally:
277
347
            pb.finished()
278
348
 
279
349
    def add_parents(self, path):
280
350
        dirname, _ = osutils.split(path)
281
 
        file_id = self.path2id(dirname)
 
351
        file_id = super(GitIndexInventory, self).path2id(dirname)
282
352
        if file_id is None:
283
353
            if dirname == "":
284
354
                parent_fid = None
285
355
            else:
286
356
                parent_fid = self.add_parents(dirname)
287
 
            ie = self.add_path(dirname, 'directory', 
288
 
                    self.mapping.generate_file_id(dirname), parent_fid)
 
357
            ie = self.add_path(dirname, 'directory',
 
358
                    self.fileid_map.lookup_file_id(dirname), parent_fid)
289
359
            if ie.file_id in self.basis_inv:
290
360
                ie.revision = self.basis_inv[ie.file_id].revision
291
361
            file_id = ie.file_id
 
362
        if type(file_id) != str:
 
363
            raise AssertionError
292
364
        return file_id
293
365