← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

[merge] Storage filename escaping

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
280
280
        for file_id in old_entries:
281
281
            entry = old_entries[file_id]
282
282
            path = id2path(file_id)
 
283
            if file_id in self.base_tree.inventory:
 
284
                executable = getattr(self.base_tree.inventory[file_id], 'executable', False)
 
285
            else:
 
286
                executable = getattr(entry, 'executable', False)
283
287
            new_inventory[file_id] = (path, file_id, entry.parent_id, 
284
 
                                      entry.kind)
 
288
                                      entry.kind, executable)
 
289
                                      
285
290
            by_path[path] = file_id
286
291
        
287
292
        deletions = 0
304
309
                parent = by_path[os.path.dirname(path)]
305
310
            abspath = pathjoin(self.this_tree.basedir, path)
306
311
            kind = bzrlib.osutils.file_kind(abspath)
307
 
            new_inventory[file_id] = (path, file_id, parent, kind)
 
312
            if file_id in self.base_tree.inventory:
 
313
                executable = getattr(self.base_tree.inventory[file_id], 'executable', False)
 
314
            else:
 
315
                executable = False
 
316
            new_inventory[file_id] = (path, file_id, parent, kind, executable)
308
317
            by_path[path] = file_id 
309
318
 
310
319
        # Get a list in insertion order