143
140
show_list(self.unchanged)
146
@deprecated_function(zero_ten)
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):
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).
163
# NB: show_status depends on being able to pass in non-versioned files and
164
# report them as unknown
169
return _compare_trees(old_tree, new_tree, want_unchanged,
177
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files):
160
179
from osutils import is_inside_any
167
186
# TODO: Rather than iterating over the whole tree and then filtering, we
168
187
# could diff just the specified files (if any) and their subtrees.
170
old_files = old_tree.list_files()
171
new_files = new_tree.list_files()
182
except StopIteration:
183
return None, None, None, None, None
184
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
185
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
188
def check_matching(old_path, old_entry, new_path, new_entry):
189
"""We have matched up 2 file_ids, check for changes."""
190
assert old_entry.kind == new_entry.kind
192
if old_entry.kind == 'root_directory':
195
if specific_file_ids:
196
if (old_entry.file_id not in specific_file_ids and
197
new_entry.file_id not in specific_file_ids):
200
# temporary hack until all entries are populated before clients
202
old_entry._read_tree_state(old_path, old_tree)
203
new_entry._read_tree_state(new_path, new_tree)
204
text_modified, meta_modified = new_entry.detect_changes(old_entry)
206
# If the name changes, or the parent_id changes, we have a rename
207
# (if we move a parent, that doesn't count as a rename for the file)
208
if (old_entry.name != new_entry.name
209
or old_entry.parent_id != new_entry.parent_id):
210
delta.renamed.append((old_path,
212
old_entry.file_id, old_entry.kind,
213
text_modified, meta_modified))
214
elif text_modified or meta_modified:
215
delta.modified.append((new_path, new_entry.file_id, new_entry.kind,
216
text_modified, meta_modified))
218
delta.unchanged.append((new_path, new_entry.file_id, new_entry.kind))
221
def handle_old(path, entry):
222
"""old entry without a new entry match
224
Check to see if a matching new entry was already seen as an
225
added file, and switch the pair into being a rename.
226
Otherwise just mark the old entry being removed.
228
if entry.file_id in added:
229
# Actually this is a rename, we found a new file_id earlier
230
# at a different location, so it is no-longer added
231
x_new_path, x_new_entry = added.pop(entry.file_id)
232
check_matching(path, entry, x_new_path, x_new_entry)
234
# We have an old_file_id which doesn't line up with a new_file_id
235
# So this file looks to be removed
236
assert entry.file_id not in removed
237
removed[entry.file_id] = path, entry
239
def handle_new(path, entry):
240
"""new entry without an old entry match
242
Check to see if a matching old entry was already seen as a
243
removal, and change the pair into a rename.
244
Otherwise just mark the new entry as an added file.
246
if entry.file_id in removed:
247
# We saw this file_id earlier at an old different location
248
# it is no longer removed, just renamed
249
x_old_path, x_old_entry = removed.pop(entry.file_id)
250
check_matching(x_old_path, x_old_entry, path, entry)
252
# We have a new file which does not match an old file
254
assert entry.file_id not in added
255
added[entry.file_id] = path, entry
257
while old_path or new_path:
258
# list_files() returns files in alphabetical path sorted order
259
if old_path == new_path:
260
if old_file_id == new_file_id:
261
# This is the common case, the files are in the same place
262
# check if there were any content changes
264
if old_file_id is None:
265
# We have 2 unversioned files, no deltas possible???
268
check_matching(old_path, old_entry, new_path, new_entry)
270
# The ids don't match, so we have to handle them both
272
if old_file_id is not None:
273
handle_old(old_path, old_entry)
275
if new_file_id is not None:
276
handle_new(new_path, new_entry)
278
# The two entries were at the same path, so increment both sides
279
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
280
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
281
elif new_path is None or (old_path is not None and old_path < new_path):
282
# Assume we don't match, only process old_path
283
if old_file_id is not None:
284
handle_old(old_path, old_entry)
285
# old_path came first, so increment it, trying to match up
286
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
287
elif new_path is not None:
288
# new_path came first, so increment it, trying to match up
289
if new_file_id is not None:
290
handle_new(new_path, new_entry)
291
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
293
# Now we have a set of added and removed files, mark them all
294
for old_path, old_entry in removed.itervalues():
295
if specific_file_ids:
296
if not old_entry.file_id in specific_file_ids:
298
delta.removed.append((old_path, old_entry.file_id, old_entry.kind))
299
for new_path, new_entry in added.itervalues():
300
if specific_file_ids:
301
if not new_entry.file_id in specific_file_ids:
303
delta.added.append((new_path, new_entry.file_id, new_entry.kind))
188
# Perhaps should take a list of file-ids instead? Need to indicate any
189
# ids or names which were not found in the trees.
191
for file_id in old_tree:
192
if file_id in new_tree:
193
old_ie = old_inv[file_id]
194
new_ie = new_inv[file_id]
197
assert kind == new_ie.kind
199
assert kind in InventoryEntry.known_kinds, \
200
'invalid file kind %r' % kind
202
if kind == 'root_directory':
206
if (not is_inside_any(specific_files, old_inv.id2path(file_id))
207
and not is_inside_any(specific_files, new_inv.id2path(file_id))):
210
# temporary hack until all entries are populated before clients
212
old_path = old_inv.id2path(file_id)
213
new_path = new_inv.id2path(file_id)
214
old_ie._read_tree_state(old_path, old_tree)
215
new_ie._read_tree_state(new_path, new_tree)
216
text_modified, meta_modified = new_ie.detect_changes(old_ie)
218
# TODO: Can possibly avoid calculating path strings if the
219
# two files are unchanged and their names and parents are
220
# the same and the parents are unchanged all the way up.
221
# May not be worthwhile.
223
if (old_ie.name != new_ie.name
224
or old_ie.parent_id != new_ie.parent_id):
225
delta.renamed.append((old_path,
228
text_modified, meta_modified))
229
elif text_modified or meta_modified:
230
delta.modified.append((new_path, file_id, kind,
231
text_modified, meta_modified))
233
delta.unchanged.append((new_path, file_id, kind))
235
kind = old_inv.get_file_kind(file_id)
236
if kind == 'root_directory':
238
old_path = old_inv.id2path(file_id)
240
if not is_inside_any(specific_files, old_path):
242
delta.removed.append((old_path, file_id, kind))
244
mutter('start looking for new files')
245
for file_id in new_inv:
246
if file_id in old_inv or file_id not in new_tree:
248
kind = new_inv.get_file_kind(file_id)
249
if kind == 'root_directory':
251
new_path = new_inv.id2path(file_id)
253
if not is_inside_any(specific_files, new_path):
255
delta.added.append((new_path, file_id, kind))
305
257
delta.removed.sort()
306
258
delta.added.sort()
307
259
delta.renamed.sort()
308
# TODO: jam 20060529 These lists shouldn't need to be sorted
309
# since we added them in alphabetical order.
310
260
delta.modified.sort()
311
261
delta.unchanged.sort()
added
removed
bzrlib/delta.py
