~bzr-pqm/bzr/bzr.dev

Use the working tree for path lookups as Robert suggested. We still need to fall back to the other tree though in the case of files being added.

added added

removed removed

1164

# OTHER changed the file

1165

wt = self.this_tree

1166

if wt.supports_content_filtering():

1167

filter_tree_path = self.other_tree.id2path(file_id)

1167

# We get the path from the working tree if it exists.

1168

# That fails though when OTHER is adding a file, so

1169

# we fall back to the other tree to find the path if

1170

# it doesn't exist locally.

1171

try:

1172

filter_tree_path = wt.id2path(file_id)

1173

except errors.NoSuchId:

1174

filter_tree_path = self.other_tree.id2path(file_id)

1168

1175

else:

1169

1176

# Skip the id2path lookup for older formats

1170

1177

filter_tree_path = None