126
156
if meta_modified:
129
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
131
print >>to_file, ' %s => %s' % (oldpath, newpath)
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))
133
179
if self.modified or extra_modified:
134
print >>to_file, 'modified:'
135
show_list(self.modified)
136
show_list(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)
138
187
if show_unchanged and self.unchanged:
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
163
from osutils import is_inside_any
165
old_inv = old_tree.inventory
166
new_inv = new_tree.inventory
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."""
167
210
delta = TreeDelta()
168
mutter('start compare_trees')
170
# TODO: match for specific files can be rather smarter by finding
171
# the IDs of those files up front and then considering only that.
173
for file_id in old_tree:
174
if file_id in new_tree:
175
old_ie = old_inv[file_id]
176
new_ie = new_inv[file_id]
179
assert kind == new_ie.kind
181
assert kind in InventoryEntry.known_kinds, \
182
'invalid file kind %r' % kind
184
if kind == 'root_directory':
188
if (not is_inside_any(specific_files, old_inv.id2path(file_id))
189
and not is_inside_any(specific_files, new_inv.id2path(file_id))):
192
# temporary hack until all entries are populated before clients
194
old_path = old_inv.id2path(file_id)
195
new_path = new_inv.id2path(file_id)
196
old_ie._read_tree_state(old_path, old_tree)
197
new_ie._read_tree_state(new_path, new_tree)
198
text_modified, meta_modified = new_ie.detect_changes(old_ie)
200
# TODO: Can possibly avoid calculating path strings if the
201
# two files are unchanged and their names and parents are
202
# the same and the parents are unchanged all the way up.
203
# May not be worthwhile.
205
if (old_ie.name != new_ie.name
206
or old_ie.parent_id != new_ie.parent_id):
207
delta.renamed.append((old_path,
210
text_modified, meta_modified))
211
elif text_modified or meta_modified:
212
delta.modified.append((new_path, file_id, kind,
213
text_modified, meta_modified))
215
delta.unchanged.append((new_path, file_id, kind))
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
assert fully_present[0] is True
230
delta.removed.append((path[0], file_id, kind[0]))
231
elif fully_present[0] is False:
233
elif name[0] != name[1] or parent_id[0] != parent_id[1]:
234
# If the name changes, or the parent_id changes, we have a rename
235
# (if we move a parent, that doesn't count as a rename for the
237
delta.renamed.append((path[0],
242
(executable[0] != executable[1])))
243
elif kind[0] != kind[1]:
244
delta.kind_changed.append((path[1], file_id, kind[0], kind[1]))
245
elif content_change is True or executable[0] != executable[1]:
246
delta.modified.append((path[1], file_id, kind[1],
248
(executable[0] != executable[1])))
217
kind = old_inv.get_file_kind(file_id)
218
if kind == 'root_directory':
220
old_path = old_inv.id2path(file_id)
222
if not is_inside_any(specific_files, old_path):
224
delta.removed.append((old_path, file_id, kind))
250
delta.unchanged.append((path[1], file_id, kind[1]))
226
mutter('start looking for new files')
227
for file_id in new_inv:
228
if file_id in old_inv or file_id not in new_tree:
230
kind = new_inv.get_file_kind(file_id)
231
if kind == 'root_directory':
233
new_path = new_inv.id2path(file_id)
235
if not is_inside_any(specific_files, new_path):
237
delta.added.append((new_path, file_id, kind))
239
252
delta.removed.sort()
240
253
delta.added.sort()
241
254
delta.renamed.sort()
255
# TODO: jam 20060529 These lists shouldn't need to be sorted
256
# since we added them in alphabetical order.
242
257
delta.modified.sort()
243
258
delta.unchanged.sort()
263
class _ChangeReporter(object):
264
"""Report changes between two trees"""
266
def __init__(self, output=None, suppress_root_add=True,
267
output_file=None, unversioned_filter=None):
270
:param output: a function with the signature of trace.note, i.e.
271
accepts a format and parameters.
272
:param supress_root_add: If true, adding the root will be ignored
273
(i.e. when a tree has just been initted)
274
:param output_file: If supplied, a file-like object to write to.
275
Only one of output and output_file may be supplied.
276
:param unversioned_filter: A filter function to be called on
277
unversioned files. This should return True to ignore a path.
278
By default, no filtering takes place.
280
if output_file is not None:
281
if output is not None:
282
raise BzrError('Cannot specify both output and output_file')
283
def output(fmt, *args):
284
output_file.write((fmt % args) + '\n')
286
if self.output is None:
287
from bzrlib import trace
288
self.output = trace.note
289
self.suppress_root_add = suppress_root_add
290
self.modified_map = {'kind changed': 'K',
295
self.versioned_map = {'added': '+', # versioned target
296
'unchanged': ' ', # versioned in both
297
'removed': '-', # versioned in source
298
'unversioned': '?', # versioned in neither
300
self.unversioned_filter = unversioned_filter
302
def report(self, file_id, paths, versioned, renamed, modified, exe_change,
304
"""Report one change to a file
306
:param file_id: The file_id of the file
307
:param path: The old and new paths as generated by Tree._iter_changes.
308
:param versioned: may be 'added', 'removed', 'unchanged', or
310
:param renamed: may be True or False
311
:param modified: may be 'created', 'deleted', 'kind changed',
312
'modified' or 'unchanged'.
313
:param exe_change: True if the execute bit has changed
314
:param kind: A pair of file kinds, as generated by Tree._iter_changes.
315
None indicates no file present.
317
if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
319
if versioned == 'unversioned':
320
# skip ignored unversioned files if needed.
321
if self.unversioned_filter is not None:
322
if self.unversioned_filter(paths[1]):
324
# dont show a content change in the output.
325
modified = 'unchanged'
326
# we show both paths in the following situations:
327
# the file versioning is unchanged AND
328
# ( the path is different OR
329
# the kind is different)
330
if (versioned == 'unchanged' and
331
(renamed or modified == 'kind changed')):
333
# on a rename, we show old and new
334
old_path, path = paths
336
# if it's not renamed, we're showing both for kind changes
337
# so only show the new path
338
old_path, path = paths[1], paths[1]
339
# if the file is not missing in the source, we show its kind
340
# when we show two paths.
341
if kind[0] is not None:
342
old_path += osutils.kind_marker(kind[0])
344
elif versioned == 'removed':
345
# not present in target
354
rename = self.versioned_map[versioned]
355
# we show the old kind on the new path when the content is deleted.
356
if modified == 'deleted':
357
path += osutils.kind_marker(kind[0])
358
# otherwise we always show the current kind when there is one
359
elif kind[1] is not None:
360
path += osutils.kind_marker(kind[1])
365
self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
369
def report_changes(change_iterator, reporter):
370
"""Report the changes from a change iterator.
372
This is essentially a translation from low-level to medium-level changes.
373
Further processing may be required to produce a human-readable output.
374
Unfortunately, some tree-changing operations are very complex
375
:change_iterator: an iterator or sequence of changes in the format
376
generated by Tree._iter_changes
377
:param reporter: The _ChangeReporter that will report the changes.
379
versioned_change_map = {
380
(True, True) : 'unchanged',
381
(True, False) : 'removed',
382
(False, True) : 'added',
383
(False, False): 'unversioned',
385
for (file_id, path, content_change, versioned, parent_id, name, kind,
386
executable) in change_iterator:
388
# files are "renamed" if they are moved or if name changes, as long
390
if None not in name and None not in parent_id and\
391
(name[0] != name[1] or parent_id[0] != parent_id[1]):
395
if kind[0] != kind[1]:
398
elif kind[1] is None:
401
modified = "kind changed"
404
modified = "modified"
406
modified = "unchanged"
407
if kind[1] == "file":
408
exe_change = (executable[0] != executable[1])
409
versioned_change = versioned_change_map[versioned]
410
reporter.report(file_id, path, versioned_change, renamed, modified,