156
126
if meta_modified:
159
to_file.write(indent + '%s %s => %s %s\n' % (
160
short_status_letter, oldpath, newpath, fid))
162
to_file.write(indent + '%s %s => %s\n' % (
163
short_status_letter, oldpath, newpath))
165
if self.kind_changed:
167
short_status_letter = 'K'
169
to_file.write(indent + 'kind changed:\n')
170
short_status_letter = ''
171
for (path, fid, old_kind, new_kind) in self.kind_changed:
176
to_file.write(indent + '%s %s (%s => %s)%s\n' % (
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
to_file.write(indent + 'modified:\n')
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
to_file.write(indent + 'unchanged:\n')
190
show_list(self.unchanged)
192
show_list(self.unchanged, 'S')
195
to_file.write(indent + 'unknown:\n')
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()
206
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
207
include_root, extra_trees=None,
208
require_versioned=False, want_unversioned=False):
209
"""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
167
return _compare_trees(old_tree, new_tree, want_unchanged,
175
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files):
177
from osutils import is_inside_any
179
old_inv = old_tree.inventory
180
new_inv = new_tree.inventory
210
181
delta = TreeDelta()
211
# mutter('start compare_trees')
213
for (file_id, path, content_change, versioned, parent_id, name, kind,
214
executable) in new_tree.iter_changes(old_tree, want_unchanged,
215
specific_files, extra_trees=extra_trees,
216
require_versioned=require_versioned,
217
want_unversioned=want_unversioned):
218
if versioned == (False, False):
219
delta.unversioned.append((path[1], None, kind[1]))
221
if not include_root and (None, None) == parent_id:
223
fully_present = tuple((versioned[x] and kind[x] is not None) for
225
if fully_present[0] != fully_present[1]:
226
if fully_present[1] is True:
227
delta.added.append((path[1], file_id, kind[1]))
229
delta.removed.append((path[0], file_id, kind[0]))
230
elif fully_present[0] is False:
232
elif name[0] != name[1] or parent_id[0] != parent_id[1]:
233
# If the name changes, or the parent_id changes, we have a rename
234
# (if we move a parent, that doesn't count as a rename for the
236
delta.renamed.append((path[0],
241
(executable[0] != executable[1])))
242
elif kind[0] != kind[1]:
243
delta.kind_changed.append((path[1], file_id, kind[0], kind[1]))
244
elif content_change or executable[0] != executable[1]:
245
delta.modified.append((path[1], file_id, kind[1],
247
(executable[0] != executable[1])))
182
mutter('start compare_trees')
184
# TODO: match for specific files can be rather smarter by finding
185
# the IDs of those files up front and then considering only that.
187
for file_id in old_tree:
188
if file_id in new_tree:
189
old_ie = old_inv[file_id]
190
new_ie = new_inv[file_id]
193
assert kind == new_ie.kind
195
assert kind in InventoryEntry.known_kinds, \
196
'invalid file kind %r' % kind
198
if kind == 'root_directory':
202
if (not is_inside_any(specific_files, old_inv.id2path(file_id))
203
and not is_inside_any(specific_files, new_inv.id2path(file_id))):
206
# temporary hack until all entries are populated before clients
208
old_path = old_inv.id2path(file_id)
209
new_path = new_inv.id2path(file_id)
210
old_ie._read_tree_state(old_path, old_tree)
211
new_ie._read_tree_state(new_path, new_tree)
212
text_modified, meta_modified = new_ie.detect_changes(old_ie)
214
# TODO: Can possibly avoid calculating path strings if the
215
# two files are unchanged and their names and parents are
216
# the same and the parents are unchanged all the way up.
217
# May not be worthwhile.
219
if (old_ie.name != new_ie.name
220
or old_ie.parent_id != new_ie.parent_id):
221
delta.renamed.append((old_path,
224
text_modified, meta_modified))
225
elif text_modified or meta_modified:
226
delta.modified.append((new_path, file_id, kind,
227
text_modified, meta_modified))
229
delta.unchanged.append((new_path, file_id, kind))
249
delta.unchanged.append((path[1], file_id, kind[1]))
231
kind = old_inv.get_file_kind(file_id)
232
if kind == 'root_directory':
234
old_path = old_inv.id2path(file_id)
236
if not is_inside_any(specific_files, old_path):
238
delta.removed.append((old_path, file_id, kind))
240
mutter('start looking for new files')
241
for file_id in new_inv:
242
if file_id in old_inv or file_id not in new_tree:
244
kind = new_inv.get_file_kind(file_id)
245
if kind == 'root_directory':
247
new_path = new_inv.id2path(file_id)
249
if not is_inside_any(specific_files, new_path):
251
delta.added.append((new_path, file_id, kind))
251
253
delta.removed.sort()
252
254
delta.added.sort()
253
255
delta.renamed.sort()
254
# TODO: jam 20060529 These lists shouldn't need to be sorted
255
# since we added them in alphabetical order.
256
256
delta.modified.sort()
257
257
delta.unchanged.sort()
262
class _ChangeReporter(object):
263
"""Report changes between two trees"""
265
def __init__(self, output=None, suppress_root_add=True,
266
output_file=None, unversioned_filter=None):
269
:param output: a function with the signature of trace.note, i.e.
270
accepts a format and parameters.
271
:param supress_root_add: If true, adding the root will be ignored
272
(i.e. when a tree has just been initted)
273
:param output_file: If supplied, a file-like object to write to.
274
Only one of output and output_file may be supplied.
275
:param unversioned_filter: A filter function to be called on
276
unversioned files. This should return True to ignore a path.
277
By default, no filtering takes place.
279
if output_file is not None:
280
if output is not None:
281
raise BzrError('Cannot specify both output and output_file')
282
def output(fmt, *args):
283
output_file.write((fmt % args) + '\n')
285
if self.output is None:
286
from bzrlib import trace
287
self.output = trace.note
288
self.suppress_root_add = suppress_root_add
289
self.modified_map = {'kind changed': 'K',
294
self.versioned_map = {'added': '+', # versioned target
295
'unchanged': ' ', # versioned in both
296
'removed': '-', # versioned in source
297
'unversioned': '?', # versioned in neither
299
self.unversioned_filter = unversioned_filter
301
def report(self, file_id, paths, versioned, renamed, modified, exe_change,
303
"""Report one change to a file
305
:param file_id: The file_id of the file
306
:param path: The old and new paths as generated by Tree.iter_changes.
307
:param versioned: may be 'added', 'removed', 'unchanged', or
309
:param renamed: may be True or False
310
:param modified: may be 'created', 'deleted', 'kind changed',
311
'modified' or 'unchanged'.
312
:param exe_change: True if the execute bit has changed
313
:param kind: A pair of file kinds, as generated by Tree.iter_changes.
314
None indicates no file present.
318
if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
320
if versioned == 'unversioned':
321
# skip ignored unversioned files if needed.
322
if self.unversioned_filter is not None:
323
if self.unversioned_filter(paths[1]):
325
# dont show a content change in the output.
326
modified = 'unchanged'
327
# we show both paths in the following situations:
328
# the file versioning is unchanged AND
329
# ( the path is different OR
330
# the kind is different)
331
if (versioned == 'unchanged' and
332
(renamed or modified == 'kind changed')):
334
# on a rename, we show old and new
335
old_path, path = paths
337
# if it's not renamed, we're showing both for kind changes
338
# so only show the new path
339
old_path, path = paths[1], paths[1]
340
# if the file is not missing in the source, we show its kind
341
# when we show two paths.
342
if kind[0] is not None:
343
old_path += osutils.kind_marker(kind[0])
345
elif versioned == 'removed':
346
# not present in target
355
rename = self.versioned_map[versioned]
356
# we show the old kind on the new path when the content is deleted.
357
if modified == 'deleted':
358
path += osutils.kind_marker(kind[0])
359
# otherwise we always show the current kind when there is one
360
elif kind[1] is not None:
361
path += osutils.kind_marker(kind[1])
366
self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
370
def report_changes(change_iterator, reporter):
371
"""Report the changes from a change iterator.
373
This is essentially a translation from low-level to medium-level changes.
374
Further processing may be required to produce a human-readable output.
375
Unfortunately, some tree-changing operations are very complex
376
:change_iterator: an iterator or sequence of changes in the format
377
generated by Tree.iter_changes
378
:param reporter: The _ChangeReporter that will report the changes.
380
versioned_change_map = {
381
(True, True) : 'unchanged',
382
(True, False) : 'removed',
383
(False, True) : 'added',
384
(False, False): 'unversioned',
386
for (file_id, path, content_change, versioned, parent_id, name, kind,
387
executable) in change_iterator:
389
# files are "renamed" if they are moved or if name changes, as long
391
if None not in name and None not in parent_id and\
392
(name[0] != name[1] or parent_id[0] != parent_id[1]):
396
if kind[0] != kind[1]:
399
elif kind[1] is None:
402
modified = "kind changed"
405
modified = "modified"
407
modified = "unchanged"
408
if kind[1] == "file":
409
exe_change = (executable[0] != executable[1])
410
versioned_change = versioned_change_map[versioned]
411
reporter.report(file_id, path, versioned_change, renamed, modified,
added
removed
bzrlib/delta.py
