140
143
show_list(self.unchanged)
144
def compare_trees(old_tree, new_tree, want_unchanged=False, specific_files=None):
145
"""Describe changes from one tree to another.
147
Returns a TreeDelta with details of added, modified, renamed, and
150
The root entry is specifically exempt.
152
This only considers versioned files.
155
If true, also list files unchanged from one version to
159
If true, only check for changes to specified names or
160
files within them. Any unversioned files given have no effect
161
(but this might change in the future).
168
return _compare_trees(old_tree, new_tree, want_unchanged,
176
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files):
146
@deprecated_function(zero_nine)
147
def compare_trees(old_tree, new_tree, want_unchanged=False,
148
specific_files=None, extra_trees=None,
149
require_versioned=False):
150
"""compare_trees was deprecated in 0.10. Please see Tree.changes_from."""
151
return new_tree.changes_from(old_tree,
152
want_unchanged=want_unchanged,
153
specific_files=specific_files,
154
extra_trees=extra_trees,
155
require_versioned=require_versioned)
158
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids,
178
161
from osutils import is_inside_any
180
163
old_inv = old_tree.inventory
181
164
new_inv = new_tree.inventory
182
165
delta = TreeDelta()
183
mutter('start compare_trees')
166
# mutter('start compare_trees')
185
168
# TODO: Rather than iterating over the whole tree and then filtering, we
186
169
# could diff just the specified files (if any) and their subtrees.
187
# Perhaps should take a list of file-ids instead? Need to indicate any
188
# ids or names which were not found in the trees.
190
for file_id in old_tree:
191
if file_id in new_tree:
192
old_ie = old_inv[file_id]
193
new_ie = new_inv[file_id]
196
assert kind == new_ie.kind
198
assert kind in InventoryEntry.known_kinds, \
199
'invalid file kind %r' % kind
201
if kind == 'root_directory':
205
if (not is_inside_any(specific_files, old_inv.id2path(file_id))
206
and not is_inside_any(specific_files, new_inv.id2path(file_id))):
209
# temporary hack until all entries are populated before clients
211
old_path = old_inv.id2path(file_id)
212
new_path = new_inv.id2path(file_id)
213
old_ie._read_tree_state(old_path, old_tree)
214
new_ie._read_tree_state(new_path, new_tree)
215
text_modified, meta_modified = new_ie.detect_changes(old_ie)
217
# TODO: Can possibly avoid calculating path strings if the
218
# two files are unchanged and their names and parents are
219
# the same and the parents are unchanged all the way up.
220
# May not be worthwhile.
222
if (old_ie.name != new_ie.name
223
or old_ie.parent_id != new_ie.parent_id):
224
delta.renamed.append((old_path,
227
text_modified, meta_modified))
228
elif text_modified or meta_modified:
229
delta.modified.append((new_path, file_id, kind,
230
text_modified, meta_modified))
232
delta.unchanged.append((new_path, file_id, kind))
234
kind = old_inv.get_file_kind(file_id)
235
if kind == 'root_directory':
237
old_path = old_inv.id2path(file_id)
239
if not is_inside_any(specific_files, old_path):
241
delta.removed.append((old_path, file_id, kind))
243
mutter('start looking for new files')
244
for file_id in new_inv:
245
if file_id in old_inv or file_id not in new_tree:
247
kind = new_inv.get_file_kind(file_id)
248
if kind == 'root_directory':
250
new_path = new_inv.id2path(file_id)
252
if not is_inside_any(specific_files, new_path):
254
delta.added.append((new_path, file_id, kind))
171
old_files = old_tree.list_files(include_root)
172
new_files = new_tree.list_files(include_root)
183
except StopIteration:
184
return None, None, None, None, None
185
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
186
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
189
def check_matching(old_path, old_entry, new_path, new_entry):
190
"""We have matched up 2 file_ids, check for changes."""
191
assert old_entry.kind == new_entry.kind
193
if specific_file_ids:
194
if (old_entry.file_id not in specific_file_ids and
195
new_entry.file_id not in specific_file_ids):
198
# temporary hack until all entries are populated before clients
200
old_entry._read_tree_state(old_path, old_tree)
201
new_entry._read_tree_state(new_path, new_tree)
202
text_modified, meta_modified = new_entry.detect_changes(old_entry)
204
# If the name changes, or the parent_id changes, we have a rename
205
# (if we move a parent, that doesn't count as a rename for the file)
206
if (old_entry.name != new_entry.name
207
or old_entry.parent_id != new_entry.parent_id):
208
delta.renamed.append((old_path,
210
old_entry.file_id, old_entry.kind,
211
text_modified, meta_modified))
212
elif text_modified or meta_modified:
213
delta.modified.append((new_path, new_entry.file_id, new_entry.kind,
214
text_modified, meta_modified))
216
delta.unchanged.append((new_path, new_entry.file_id, new_entry.kind))
219
def handle_old(path, entry):
220
"""old entry without a new entry match
222
Check to see if a matching new entry was already seen as an
223
added file, and switch the pair into being a rename.
224
Otherwise just mark the old entry being removed.
226
if entry.file_id in added:
227
# Actually this is a rename, we found a new file_id earlier
228
# at a different location, so it is no-longer added
229
x_new_path, x_new_entry = added.pop(entry.file_id)
230
check_matching(path, entry, x_new_path, x_new_entry)
232
# We have an old_file_id which doesn't line up with a new_file_id
233
# So this file looks to be removed
234
assert entry.file_id not in removed
235
removed[entry.file_id] = path, entry
237
def handle_new(path, entry):
238
"""new entry without an old entry match
240
Check to see if a matching old entry was already seen as a
241
removal, and change the pair into a rename.
242
Otherwise just mark the new entry as an added file.
244
if entry.file_id in removed:
245
# We saw this file_id earlier at an old different location
246
# it is no longer removed, just renamed
247
x_old_path, x_old_entry = removed.pop(entry.file_id)
248
check_matching(x_old_path, x_old_entry, path, entry)
250
# We have a new file which does not match an old file
252
assert entry.file_id not in added
253
added[entry.file_id] = path, entry
255
while old_path is not None or new_path is not None:
256
# list_files() returns files in alphabetical path sorted order
257
if old_path == new_path:
258
if old_file_id == new_file_id:
259
# This is the common case, the files are in the same place
260
# check if there were any content changes
262
if old_file_id is None:
263
# We have 2 unversioned files, no deltas possible???
266
check_matching(old_path, old_entry, new_path, new_entry)
268
# The ids don't match, so we have to handle them both
270
if old_file_id is not None:
271
handle_old(old_path, old_entry)
273
if new_file_id is not None:
274
handle_new(new_path, new_entry)
276
# The two entries were at the same path, so increment both sides
277
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
278
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
279
elif new_path is None or (old_path is not None and old_path < new_path):
280
# Assume we don't match, only process old_path
281
if old_file_id is not None:
282
handle_old(old_path, old_entry)
283
# old_path came first, so increment it, trying to match up
284
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
285
elif new_path is not None:
286
# new_path came first, so increment it, trying to match up
287
if new_file_id is not None:
288
handle_new(new_path, new_entry)
289
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
291
# Now we have a set of added and removed files, mark them all
292
for old_path, old_entry in removed.itervalues():
293
if specific_file_ids:
294
if not old_entry.file_id in specific_file_ids:
296
delta.removed.append((old_path, old_entry.file_id, old_entry.kind))
297
for new_path, new_entry in added.itervalues():
298
if specific_file_ids:
299
if not new_entry.file_id in specific_file_ids:
301
delta.added.append((new_path, new_entry.file_id, new_entry.kind))
256
303
delta.removed.sort()
257
304
delta.added.sort()
258
305
delta.renamed.sort()
306
# TODO: jam 20060529 These lists shouldn't need to be sorted
307
# since we added them in alphabetical order.
259
308
delta.modified.sort()
260
309
delta.unchanged.sort()
added
removed
bzrlib/delta.py
