← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-13 03:42:59 UTC
  • mfrom: (1658.1.5 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060413034259-6466a758a88b4a94
(mbp) ftp push fix; Working_tree.set_inventory; test suite warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1156
1156
            resolve(self, filenames, ignore_misses=True)
1157
1157
        return conflicts
1158
1158
 
 
1159
    # XXX: This method should be deprecated in favour of taking in a proper
 
1160
    # new Inventory object.
1159
1161
    @needs_write_lock
1160
1162
    def set_inventory(self, new_inventory_list):
1161
1163
        from bzrlib.inventory import (Inventory,
1164
1166
                                      InventoryFile,
1165
1167
                                      InventoryLink)
1166
1168
        inv = Inventory(self.get_root_id())
1167
 
        for path, file_id, parent, kind, executable in new_inventory_list:
 
1169
        for path, file_id, parent, kind in new_inventory_list:
1168
1170
            name = os.path.basename(path)
1169
1171
            if name == "":
1170
1172
                continue
1172
1174
            if kind == 'directory':
1173
1175
                inv.add(InventoryDirectory(file_id, name, parent))
1174
1176
            elif kind == 'file':
1175
 
                ie = InventoryFile(file_id, name, parent)
1176
 
                ie.executable = executable
1177
 
                inv.add(ie)
 
1177
                inv.add(InventoryFile(file_id, name, parent))
1178
1178
            elif kind == 'symlink':
1179
1179
                inv.add(InventoryLink(file_id, name, parent))
1180
1180
            else: