← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2006-04-13 03:06:14 UTC
  • mto: This revision was merged to the branch mainline in revision 1659.
  • Revision ID: mbp@sourcefrog.net-20060413030614-3a65b585233b029f
Revert changes to WorkingTree.set_inventory to unbreak bzrtools

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1164
1164
                                      InventoryFile,
1165
1165
                                      InventoryLink)
1166
1166
        inv = Inventory(self.get_root_id())
1167
 
        for path, file_id, parent, kind, executable in new_inventory_list:
 
1167
        for path, file_id, parent, kind in new_inventory_list:
1168
1168
            name = os.path.basename(path)
1169
1169
            if name == "":
1170
1170
                continue
1172
1172
            if kind == 'directory':
1173
1173
                inv.add(InventoryDirectory(file_id, name, parent))
1174
1174
            elif kind == 'file':
1175
 
                ie = InventoryFile(file_id, name, parent)
1176
 
                ie.executable = executable
1177
 
                inv.add(ie)
 
1175
                inv.add(InventoryFile(file_id, name, parent))
1178
1176
            elif kind == 'symlink':
1179
1177
                inv.add(InventoryLink(file_id, name, parent))
1180
1178
            else: