103
104
if v[1] == file_id:
107
def get_changes_as_text(self, show_ids=False, show_unchanged=False,
110
output = StringIO.StringIO()
111
report_delta(output, self, short_status, show_ids, show_unchanged)
112
return output.getvalue()
109
def show(self, to_file, show_ids=False, show_unchanged=False,
111
"""output this delta in status-like form to to_file."""
112
def show_list(files, short_status_letter=''):
114
path, fid, kind = item[:3]
116
if kind == 'directory':
118
elif kind == 'symlink':
121
if len(item) == 5 and item[4]:
125
print >>to_file, '%s %-30s %s' % (short_status_letter,
128
print >>to_file, '%s %s' % (short_status_letter, path)
132
print >>to_file, 'removed:'
133
show_list(self.removed)
135
show_list(self.removed, 'D')
139
print >>to_file, 'added:'
140
show_list(self.added)
142
show_list(self.added, 'A')
147
short_status_letter = 'R'
149
print >>to_file, 'renamed:'
150
short_status_letter = ''
151
for (oldpath, newpath, fid, kind,
152
text_modified, meta_modified) in self.renamed:
153
if text_modified or meta_modified:
154
extra_modified.append((newpath, fid, kind,
155
text_modified, meta_modified))
159
print >>to_file, '%s %s => %s %s' % (
160
short_status_letter, oldpath, newpath, fid)
162
print >>to_file, '%s %s => %s' % (
163
short_status_letter, oldpath, newpath)
165
if self.kind_changed:
167
short_status_letter = 'K'
169
print >>to_file, 'kind changed:'
170
short_status_letter = ''
171
for (path, fid, old_kind, new_kind) in self.kind_changed:
176
print >>to_file, '%s %s (%s => %s)%s' % (
177
short_status_letter, path, old_kind, new_kind, suffix)
179
if self.modified or extra_modified:
180
short_status_letter = 'M'
182
print >>to_file, 'modified:'
183
short_status_letter = ''
184
show_list(self.modified, short_status_letter)
185
show_list(extra_modified, short_status_letter)
187
if show_unchanged and self.unchanged:
189
print >>to_file, 'unchanged:'
190
show_list(self.unchanged)
192
show_list(self.unchanged, 'S')
195
print >>to_file, 'unknown:'
196
show_list(self.unversioned)
199
@deprecated_function(zero_nine)
200
def compare_trees(old_tree, new_tree, want_unchanged=False,
201
specific_files=None, extra_trees=None,
202
require_versioned=False):
203
"""compare_trees was deprecated in 0.10. Please see Tree.changes_from."""
204
return new_tree.changes_from(old_tree,
205
want_unchanged=want_unchanged,
206
specific_files=specific_files,
207
extra_trees=extra_trees,
208
require_versioned=require_versioned,
115
212
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
116
213
include_root, extra_trees=None,
117
require_versioned=False, want_unversioned=False):
214
want_unversioned=False):
118
215
"""Worker function that implements Tree.changes_from."""
119
216
delta = TreeDelta()
120
217
# mutter('start compare_trees')
122
219
for (file_id, path, content_change, versioned, parent_id, name, kind,
123
executable) in new_tree.iter_changes(old_tree, want_unchanged,
220
executable) in new_tree._iter_changes(old_tree, want_unchanged,
124
221
specific_files, extra_trees=extra_trees,
125
require_versioned=require_versioned,
126
222
want_unversioned=want_unversioned):
127
223
if versioned == (False, False):
128
delta.unversioned.append((path[1], None, kind[1]))
224
delta.unversioned.append((path, None, kind[1]))
130
226
if not include_root and (None, None) == parent_id:
134
230
if fully_present[0] != fully_present[1]:
135
231
if fully_present[1] is True:
136
delta.added.append((path[1], file_id, kind[1]))
232
delta.added.append((path, file_id, kind[1]))
138
delta.removed.append((path[0], file_id, kind[0]))
234
assert fully_present[0] is True
235
old_path = old_tree.id2path(file_id)
236
delta.removed.append((old_path, file_id, kind[0]))
139
237
elif fully_present[0] is False:
141
239
elif name[0] != name[1] or parent_id[0] != parent_id[1]:
142
240
# If the name changes, or the parent_id changes, we have a rename
143
241
# (if we move a parent, that doesn't count as a rename for the
145
delta.renamed.append((path[0],
243
old_path = old_tree.id2path(file_id)
244
delta.renamed.append((old_path,
150
249
(executable[0] != executable[1])))
151
250
elif kind[0] != kind[1]:
152
delta.kind_changed.append((path[1], file_id, kind[0], kind[1]))
153
elif content_change or executable[0] != executable[1]:
154
delta.modified.append((path[1], file_id, kind[1],
251
delta.kind_changed.append((path, file_id, kind[0], kind[1]))
252
elif content_change is True or executable[0] != executable[1]:
253
delta.modified.append((path, file_id, kind[1],
156
255
(executable[0] != executable[1])))
158
delta.unchanged.append((path[1], file_id, kind[1]))
257
delta.unchanged.append((path, file_id, kind[1]))
160
259
delta.removed.sort()
161
260
delta.added.sort()
171
class _ChangeReporter(object):
270
class ChangeReporter(object):
172
271
"""Report changes between two trees"""
174
def __init__(self, output=None, suppress_root_add=True,
175
output_file=None, unversioned_filter=None, view_info=None):
273
def __init__(self, old_inventory, output=None, suppress_root_add=True,
277
:param old_inventory: The inventory of the old tree
178
278
:param output: a function with the signature of trace.note, i.e.
179
279
accepts a format and parameters.
180
280
:param supress_root_add: If true, adding the root will be ignored
181
281
(i.e. when a tree has just been initted)
182
282
:param output_file: If supplied, a file-like object to write to.
183
283
Only one of output and output_file may be supplied.
184
:param unversioned_filter: A filter function to be called on
185
unversioned files. This should return True to ignore a path.
186
By default, no filtering takes place.
187
:param view_info: A tuple of view_name,view_files if only
188
items inside a view are to be reported on, or None for
285
self.old_inventory = old_inventory
191
286
if output_file is not None:
192
287
if output is not None:
193
288
raise BzrError('Cannot specify both output and output_file')
198
293
from bzrlib import trace
199
294
self.output = trace.note
200
295
self.suppress_root_add = suppress_root_add
201
self.modified_map = {'kind changed': 'K',
206
self.versioned_map = {'added': '+', # versioned target
207
'unchanged': ' ', # versioned in both
208
'removed': '-', # versioned in source
209
'unversioned': '?', # versioned in neither
211
self.unversioned_filter = unversioned_filter
212
if view_info is None:
213
self.view_name = None
216
self.view_name = view_info[0]
217
self.view_files = view_info[1]
218
self.output("Operating on whole tree but only reporting on "
219
"'%s' view." % (self.view_name,))
221
def report(self, file_id, paths, versioned, renamed, modified, exe_change,
297
def report(self, file_id, path, versioned, renamed, modified, exe_change,
223
299
"""Report one change to a file
225
301
:param file_id: The file_id of the file
226
:param path: The old and new paths as generated by Tree.iter_changes.
227
:param versioned: may be 'added', 'removed', 'unchanged', or
302
:param path: The path the file has (or would have) in the tree (as
303
generated by Tree._iter_changes)
304
:param versioned: may be 'added', 'removed', or 'unchanged'
229
305
:param renamed: may be True or False
230
306
:param modified: may be 'created', 'deleted', 'kind changed',
231
307
'modified' or 'unchanged'.
232
308
:param exe_change: True if the execute bit has changed
233
:param kind: A pair of file kinds, as generated by Tree.iter_changes.
309
:param kind: A pair of file kinds, as generated by Tree._iter_changes.
234
310
None indicates no file present.
238
if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
240
if self.view_files and not osutils.is_inside_any(self.view_files,
243
if versioned == 'unversioned':
244
# skip ignored unversioned files if needed.
245
if self.unversioned_filter is not None:
246
if self.unversioned_filter(paths[1]):
248
# dont show a content change in the output.
249
modified = 'unchanged'
250
# we show both paths in the following situations:
251
# the file versioning is unchanged AND
252
# ( the path is different OR
253
# the kind is different)
254
if (versioned == 'unchanged' and
255
(renamed or modified == 'kind changed')):
257
# on a rename, we show old and new
258
old_path, path = paths
260
# if it's not renamed, we're showing both for kind changes
261
# so only show the new path
262
old_path, path = paths[1], paths[1]
263
# if the file is not missing in the source, we show its kind
264
# when we show two paths.
265
if kind[0] is not None:
266
old_path += osutils.kind_marker(kind[0])
268
elif versioned == 'removed':
269
# not present in target
312
if path == '' and versioned == 'added' and self.suppress_root_add:
314
modified_map = {'kind changed': 'K',
319
versioned_map = {'added': '+',
324
old_path = self.old_inventory.id2path(file_id)
278
rename = self.versioned_map[versioned]
279
# we show the old kind on the new path when the content is deleted.
327
rename = versioned_map[versioned]
328
if modified == 'kind changed':
280
331
if modified == 'deleted':
281
332
path += osutils.kind_marker(kind[0])
282
# otherwise we always show the current kind when there is one
283
333
elif kind[1] is not None:
284
334
path += osutils.kind_marker(kind[1])
336
if kind[0] is not None:
337
old_path += osutils.kind_marker(kind[0])
289
self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
343
self.output("%s%s%s %s%s", rename, modified_map[modified], exe,
292
347
def report_changes(change_iterator, reporter):
293
348
"""Report the changes from a change iterator.
296
351
Further processing may be required to produce a human-readable output.
297
352
Unfortunately, some tree-changing operations are very complex
298
353
:change_iterator: an iterator or sequence of changes in the format
299
generated by Tree.iter_changes
300
:param reporter: The _ChangeReporter that will report the changes.
354
generated by Tree._iter_changes
355
:param reporter: The ChangeReporter that will report the changes.
302
versioned_change_map = {
303
(True, True) : 'unchanged',
304
(True, False) : 'removed',
305
(False, True) : 'added',
306
(False, False): 'unversioned',
308
357
for (file_id, path, content_change, versioned, parent_id, name, kind,
309
358
executable) in change_iterator:
310
359
exe_change = False
329
378
modified = "unchanged"
330
379
if kind[1] == "file":
331
380
exe_change = (executable[0] != executable[1])
332
versioned_change = versioned_change_map[versioned]
381
if versioned[0] != versioned[1]:
383
versioned_change = "removed"
385
versioned_change = "added"
387
versioned_change = "unchanged"
333
388
reporter.report(file_id, path, versioned_change, renamed, modified,
334
389
exe_change, kind)
336
def report_delta(to_file, delta, short_status=False, show_ids=False,
337
show_unchanged=False, indent='', filter=None):
338
"""Output this delta in status-like form to to_file.
340
:param to_file: A file-like object where the output is displayed.
342
:param delta: A TreeDelta containing the changes to be displayed
344
:param short_status: Single-line status if True.
346
:param show_ids: Output the file ids if True.
348
:param show_unchanged: Output the unchanged files if True.
350
:param indent: Added at the beginning of all output lines (for merged
353
:param filter: A callable receiving a path and a file id and
354
returning True if the path should be displayed.
357
def decorate_path(path, kind, meta_modified=None):
358
if kind == 'directory':
360
elif kind == 'symlink':
366
def show_more_renamed(item):
367
(oldpath, file_id, kind,
368
text_modified, meta_modified, newpath) = item
369
dec_new_path = decorate_path(newpath, kind, meta_modified)
370
to_file.write(' => %s' % dec_new_path)
371
if text_modified or meta_modified:
372
extra_modified.append((newpath, file_id, kind,
373
text_modified, meta_modified))
375
def show_more_kind_changed(item):
376
(path, file_id, old_kind, new_kind) = item
377
to_file.write(' (%s => %s)' % (old_kind, new_kind))
379
def show_path(path, file_id, kind, meta_modified,
380
default_format, with_file_id_format):
381
dec_path = decorate_path(path, kind, meta_modified)
383
to_file.write(with_file_id_format % dec_path)
385
to_file.write(default_format % dec_path)
387
def show_list(files, long_status_name, short_status_letter,
388
default_format='%s', with_file_id_format='%-30s',
393
prefix = short_status_letter
396
prefix = indent + prefix + ' '
399
path, file_id, kind = item[:3]
400
if (filter is not None and not filter(path, file_id)):
402
if not header_shown and not short_status:
403
to_file.write(indent + long_status_name + ':\n')
407
meta_modified = item[4]
409
to_file.write(prefix)
410
show_path(path, file_id, kind, meta_modified,
411
default_format, with_file_id_format)
412
if show_more is not None:
415
to_file.write(' %s' % file_id)
418
show_list(delta.removed, 'removed', 'D')
419
show_list(delta.added, 'added', 'A')
421
# Reorder delta.renamed tuples so that all lists share the same
422
# order for their 3 first fields and that they also begin like
423
# the delta.modified tuples
424
renamed = [(p, i, k, tm, mm, np)
425
for p, np, i, k, tm, mm in delta.renamed]
426
show_list(renamed, 'renamed', 'R', with_file_id_format='%s',
427
show_more=show_more_renamed)
428
show_list(delta.kind_changed, 'kind changed', 'K',
429
with_file_id_format='%s',
430
show_more=show_more_kind_changed)
431
show_list(delta.modified + extra_modified, 'modified', 'M')
433
show_list(delta.unchanged, 'unchanged', 'S')
435
show_list(delta.unversioned, 'unknown', ' ')
added
removed
bzrlib/delta.py
