← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

[merge] Storage filename escaping

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
88
88
from bzrlib.symbol_versioning import *
89
89
from bzrlib.textui import show_status
90
90
import bzrlib.tree
91
 
from bzrlib.trace import mutter
92
91
from bzrlib.transform import build_tree
 
92
from bzrlib.trace import mutter, note
93
93
from bzrlib.transport import get_transport
94
94
from bzrlib.transport.local import LocalTransport
95
95
import bzrlib.ui
1136
1136
                                      InventoryFile,
1137
1137
                                      InventoryLink)
1138
1138
        inv = Inventory(self.get_root_id())
1139
 
        for path, file_id, parent, kind in new_inventory_list:
 
1139
        for path, file_id, parent, kind, executable in new_inventory_list:
1140
1140
            name = os.path.basename(path)
1141
1141
            if name == "":
1142
1142
                continue
1144
1144
            if kind == 'directory':
1145
1145
                inv.add(InventoryDirectory(file_id, name, parent))
1146
1146
            elif kind == 'file':
1147
 
                inv.add(InventoryFile(file_id, name, parent))
 
1147
                ie = InventoryFile(file_id, name, parent)
 
1148
                ie.executable = executable
 
1149
                inv.add(ie)
1148
1150
            elif kind == 'symlink':
1149
1151
                inv.add(InventoryLink(file_id, name, parent))
1150
1152
            else: