← 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-12 04:45:32 UTC
  • mfrom: (1608.2.13 bzr.mbp.escape-stores)
  • mto: This revision was merged to the branch mainline in revision 1657.
  • Revision ID: mbp@sourcefrog.net-20060412044532-fc8c5c9408aae88b
[merge][wip] Storage escaping

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
93
93
from bzrlib.symbol_versioning import *
94
94
from bzrlib.textui import show_status
95
95
import bzrlib.tree
96
 
from bzrlib.trace import mutter
97
96
from bzrlib.transform import build_tree
 
97
from bzrlib.trace import mutter, note
98
98
from bzrlib.transport import get_transport
99
99
from bzrlib.transport.local import LocalTransport
100
100
import bzrlib.ui
1162
1162
                                      InventoryFile,
1163
1163
                                      InventoryLink)
1164
1164
        inv = Inventory(self.get_root_id())
1165
 
        for path, file_id, parent, kind in new_inventory_list:
 
1165
        for path, file_id, parent, kind, executable in new_inventory_list:
1166
1166
            name = os.path.basename(path)
1167
1167
            if name == "":
1168
1168
                continue
1170
1170
            if kind == 'directory':
1171
1171
                inv.add(InventoryDirectory(file_id, name, parent))
1172
1172
            elif kind == 'file':
1173
 
                inv.add(InventoryFile(file_id, name, parent))
 
1173
                ie = InventoryFile(file_id, name, parent)
 
1174
                ie.executable = executable
 
1175
                inv.add(ie)
1174
1176
            elif kind == 'symlink':
1175
1177
                inv.add(InventoryLink(file_id, name, parent))
1176
1178
            else: