~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/delta.py

Committer: Martin Pool
Date: 2005-10-17 05:18:20 UTC
mfrom: (1185.12.45)
mto: (1185.41.1 bzr.sftp) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1460.
Revision ID: mbp@sourcefrog.net-20051017051820-092df2c2ec42a426

[merge] from aaron

added added

removed removed

187

# get them

188

old_path = old_inv.id2path(file_id)

189

new_path = new_inv.id2path(file_id)

190

old_ie._read_tree_state(old_tree)

191

new_ie._read_tree_state(new_tree)

190

old_ie._read_tree_state(old_path, old_tree)

191

new_ie._read_tree_state(new_path, new_tree)

192

text_modified, meta_modified = new_ie.detect_changes(old_ie)

193

194

# TODO: Can possibly avoid calculating path strings if the