156
126
if meta_modified:
159
print >>to_file, indent + '%s %s => %s %s' % (
160
short_status_letter, oldpath, newpath, fid)
162
print >>to_file, indent + '%s %s => %s' % (
163
short_status_letter, oldpath, newpath)
165
if self.kind_changed:
167
short_status_letter = 'K'
169
print >>to_file, indent + 'kind changed:'
170
short_status_letter = ''
171
for (path, fid, old_kind, new_kind) in self.kind_changed:
176
print >>to_file, indent + '%s %s (%s => %s)%s' % (
177
short_status_letter, path, old_kind, new_kind, suffix)
129
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
131
print >>to_file, ' %s => %s' % (oldpath, newpath)
179
133
if self.modified or extra_modified:
180
short_status_letter = 'M'
182
print >>to_file, indent + 'modified:'
183
short_status_letter = ''
184
show_list(self.modified, short_status_letter)
185
show_list(extra_modified, short_status_letter)
134
print >>to_file, 'modified:'
135
show_list(self.modified)
136
show_list(extra_modified)
187
138
if show_unchanged and self.unchanged:
189
print >>to_file, indent + 'unchanged:'
190
show_list(self.unchanged)
192
show_list(self.unchanged, 'S')
195
print >>to_file, indent + 'unknown:'
196
show_list(self.unversioned)
198
def get_changes_as_text(self, show_ids=False, show_unchanged=False,
201
output = StringIO.StringIO()
202
self.show(output, show_ids, show_unchanged, short_status)
203
return output.getvalue()
205
@deprecated_function(zero_nine)
206
def compare_trees(old_tree, new_tree, want_unchanged=False,
207
specific_files=None, extra_trees=None,
208
require_versioned=False):
209
"""compare_trees was deprecated in 0.10. Please see Tree.changes_from."""
210
return new_tree.changes_from(old_tree,
211
want_unchanged=want_unchanged,
212
specific_files=specific_files,
213
extra_trees=extra_trees,
214
require_versioned=require_versioned,
218
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
219
include_root, extra_trees=None,
220
want_unversioned=False):
221
"""Worker function that implements Tree.changes_from."""
139
print >>to_file, 'unchanged:'
140
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).
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):
179
from osutils import is_inside_any
181
old_inv = old_tree.inventory
182
new_inv = new_tree.inventory
222
183
delta = TreeDelta()
223
# mutter('start compare_trees')
225
for (file_id, path, content_change, versioned, parent_id, name, kind,
226
executable) in new_tree._iter_changes(old_tree, want_unchanged,
227
specific_files, extra_trees=extra_trees,
228
want_unversioned=want_unversioned):
229
if versioned == (False, False):
230
delta.unversioned.append((path[1], None, kind[1]))
232
if not include_root and (None, None) == parent_id:
234
fully_present = tuple((versioned[x] and kind[x] is not None) for
236
if fully_present[0] != fully_present[1]:
237
if fully_present[1] is True:
238
delta.added.append((path[1], file_id, kind[1]))
240
assert fully_present[0] is True
241
delta.removed.append((path[0], file_id, kind[0]))
242
elif fully_present[0] is False:
244
elif name[0] != name[1] or parent_id[0] != parent_id[1]:
245
# If the name changes, or the parent_id changes, we have a rename
246
# (if we move a parent, that doesn't count as a rename for the
248
delta.renamed.append((path[0],
253
(executable[0] != executable[1])))
254
elif kind[0] != kind[1]:
255
delta.kind_changed.append((path[1], file_id, kind[0], kind[1]))
256
elif content_change is True or executable[0] != executable[1]:
257
delta.modified.append((path[1], file_id, kind[1],
259
(executable[0] != executable[1])))
184
mutter('start compare_trees')
186
# TODO: Rather than iterating over the whole tree and then filtering, we
187
# could diff just the specified files (if any) and their subtrees.
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))
261
delta.unchanged.append((path[1], file_id, kind[1]))
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))
263
257
delta.removed.sort()
264
258
delta.added.sort()
265
259
delta.renamed.sort()
266
# TODO: jam 20060529 These lists shouldn't need to be sorted
267
# since we added them in alphabetical order.
268
260
delta.modified.sort()
269
261
delta.unchanged.sort()
274
class _ChangeReporter(object):
275
"""Report changes between two trees"""
277
def __init__(self, output=None, suppress_root_add=True,
278
output_file=None, unversioned_filter=None):
281
:param output: a function with the signature of trace.note, i.e.
282
accepts a format and parameters.
283
:param supress_root_add: If true, adding the root will be ignored
284
(i.e. when a tree has just been initted)
285
:param output_file: If supplied, a file-like object to write to.
286
Only one of output and output_file may be supplied.
287
:param unversioned_filter: A filter function to be called on
288
unversioned files. This should return True to ignore a path.
289
By default, no filtering takes place.
291
if output_file is not None:
292
if output is not None:
293
raise BzrError('Cannot specify both output and output_file')
294
def output(fmt, *args):
295
output_file.write((fmt % args) + '\n')
297
if self.output is None:
298
from bzrlib import trace
299
self.output = trace.note
300
self.suppress_root_add = suppress_root_add
301
self.modified_map = {'kind changed': 'K',
306
self.versioned_map = {'added': '+', # versioned target
307
'unchanged': ' ', # versioned in both
308
'removed': '-', # versioned in source
309
'unversioned': '?', # versioned in neither
311
self.unversioned_filter = unversioned_filter
313
def report(self, file_id, paths, versioned, renamed, modified, exe_change,
315
"""Report one change to a file
317
:param file_id: The file_id of the file
318
:param path: The old and new paths as generated by Tree._iter_changes.
319
:param versioned: may be 'added', 'removed', 'unchanged', or
321
:param renamed: may be True or False
322
:param modified: may be 'created', 'deleted', 'kind changed',
323
'modified' or 'unchanged'.
324
:param exe_change: True if the execute bit has changed
325
:param kind: A pair of file kinds, as generated by Tree._iter_changes.
326
None indicates no file present.
328
if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
330
if versioned == 'unversioned':
331
# skip ignored unversioned files if needed.
332
if self.unversioned_filter is not None:
333
if self.unversioned_filter(paths[1]):
335
# dont show a content change in the output.
336
modified = 'unchanged'
337
# we show both paths in the following situations:
338
# the file versioning is unchanged AND
339
# ( the path is different OR
340
# the kind is different)
341
if (versioned == 'unchanged' and
342
(renamed or modified == 'kind changed')):
344
# on a rename, we show old and new
345
old_path, path = paths
347
# if its not renamed, we're showing both for kind changes
348
# so only show the new path
349
old_path, path = paths[1], paths[1]
350
# if the file is not missing in the source, we show its kind
351
# when we show two paths.
352
if kind[0] is not None:
353
old_path += osutils.kind_marker(kind[0])
355
elif versioned == 'removed':
356
# not present in target
365
rename = self.versioned_map[versioned]
366
# we show the old kind on the new path when the content is deleted.
367
if modified == 'deleted':
368
path += osutils.kind_marker(kind[0])
369
# otherwise we always show the current kind when there is one
370
elif kind[1] is not None:
371
path += osutils.kind_marker(kind[1])
376
self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
380
def report_changes(change_iterator, reporter):
381
"""Report the changes from a change iterator.
383
This is essentially a translation from low-level to medium-level changes.
384
Further processing may be required to produce a human-readable output.
385
Unfortunately, some tree-changing operations are very complex
386
:change_iterator: an iterator or sequence of changes in the format
387
generated by Tree._iter_changes
388
:param reporter: The _ChangeReporter that will report the changes.
390
versioned_change_map = {
391
(True, True) : 'unchanged',
392
(True, False) : 'removed',
393
(False, True) : 'added',
394
(False, False): 'unversioned',
396
for (file_id, path, content_change, versioned, parent_id, name, kind,
397
executable) in change_iterator:
399
# files are "renamed" if they are moved or if name changes, as long
401
if None not in name and None not in parent_id and\
402
(name[0] != name[1] or parent_id[0] != parent_id[1]):
406
if kind[0] != kind[1]:
409
elif kind[1] is None:
412
modified = "kind changed"
415
modified = "modified"
417
modified = "unchanged"
418
if kind[1] == "file":
419
exe_change = (executable[0] != executable[1])
420
versioned_change = versioned_change_map[versioned]
421
reporter.report(file_id, path, versioned_change, renamed, modified,
added
removed
bzrlib/delta.py
