87
102
for v in self.renamed:
88
103
if v[2] == file_id:
105
for v in self.kind_changed:
93
def show(self, to_file, show_ids=False, show_unchanged=False):
94
"""output this delta in status-like form to to_file."""
97
path, fid, kind = item[:3]
99
if kind == 'directory':
101
elif kind == 'symlink':
104
if len(item) == 5 and item[4]:
108
print >>to_file, ' %-30s %s' % (path, fid)
110
print >>to_file, ' ', path
113
print >>to_file, 'removed:'
114
show_list(self.removed)
117
print >>to_file, 'added:'
118
show_list(self.added)
123
print >>to_file, 'renamed:'
124
for (oldpath, newpath, fid, kind,
125
text_modified, meta_modified) in self.renamed:
126
if text_modified or meta_modified:
127
extra_modified.append((newpath, fid, kind,
128
text_modified, meta_modified))
132
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
134
print >>to_file, ' %s => %s' % (oldpath, newpath)
136
if self.modified or extra_modified:
137
print >>to_file, 'modified:'
138
show_list(self.modified)
139
show_list(extra_modified)
141
if show_unchanged and self.unchanged:
142
print >>to_file, 'unchanged:'
143
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):
160
from osutils import is_inside_any
162
old_inv = old_tree.inventory
163
new_inv = new_tree.inventory
110
def get_changes_as_text(self, show_ids=False, show_unchanged=False,
113
output = StringIO.StringIO()
114
report_delta(output, self, short_status, show_ids, show_unchanged)
115
return output.getvalue()
118
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
119
include_root, extra_trees=None,
120
require_versioned=False, want_unversioned=False):
121
"""Worker function that implements Tree.changes_from."""
164
122
delta = TreeDelta()
165
mutter('start compare_trees')
167
# TODO: Rather than iterating over the whole tree and then filtering, we
168
# 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 specific_file_ids:
193
if (old_entry.file_id not in specific_file_ids and
194
new_entry.file_id not in specific_file_ids):
197
# temporary hack until all entries are populated before clients
199
old_entry._read_tree_state(old_path, old_tree)
200
new_entry._read_tree_state(new_path, new_tree)
201
text_modified, meta_modified = new_entry.detect_changes(old_entry)
203
# If the name changes, or the parent_id changes, we have a rename
204
# (if we move a parent, that doesn't count as a rename for the file)
205
if (old_entry.name != new_entry.name
206
or old_entry.parent_id != new_entry.parent_id):
207
delta.renamed.append((old_path,
209
old_entry.file_id, old_entry.kind,
210
text_modified, meta_modified))
211
elif text_modified or meta_modified:
212
delta.modified.append((new_path, new_entry.file_id, new_entry.kind,
213
text_modified, meta_modified))
215
delta.unchanged.append((new_path, new_entry.file_id, new_entry.kind))
218
def handle_old(path, entry):
219
"""old entry without a new entry match
221
Check to see if a matching new entry was already seen as an
222
added file, and switch the pair into being a rename.
223
Otherwise just mark the old entry being removed.
225
if entry.file_id in added:
226
# Actually this is a rename, we found a new file_id earlier
227
# at a different location, so it is no-longer added
228
x_new_path, x_new_entry = added.pop(entry.file_id)
229
check_matching(path, entry, x_new_path, x_new_entry)
231
# We have an old_file_id which doesn't line up with a new_file_id
232
# So this file looks to be removed
233
assert entry.file_id not in removed
234
removed[entry.file_id] = path, entry
236
def handle_new(path, entry):
237
"""new entry without an old entry match
239
Check to see if a matching old entry was already seen as a
240
removal, and change the pair into a rename.
241
Otherwise just mark the new entry as an added file.
243
if entry.file_id in removed:
244
# We saw this file_id earlier at an old different location
245
# it is no longer removed, just renamed
246
x_old_path, x_old_entry = removed.pop(entry.file_id)
247
check_matching(x_old_path, x_old_entry, path, entry)
249
# We have a new file which does not match an old file
251
assert entry.file_id not in added
252
added[entry.file_id] = path, entry
254
while old_path or new_path:
255
# list_files() returns files in alphabetical path sorted order
256
if old_path == new_path:
257
if old_file_id == new_file_id:
258
# This is the common case, the files are in the same place
259
# check if there were any content changes
261
if old_file_id is None:
262
# We have 2 unversioned files, no deltas possible???
265
check_matching(old_path, old_entry, new_path, new_entry)
123
# mutter('start compare_trees')
125
for (file_id, path, content_change, versioned, parent_id, name, kind,
126
executable) in new_tree.iter_changes(old_tree, want_unchanged,
127
specific_files, extra_trees=extra_trees,
128
require_versioned=require_versioned,
129
want_unversioned=want_unversioned):
130
if versioned == (False, False):
131
delta.unversioned.append((path[1], None, kind[1]))
133
if not include_root and (None, None) == parent_id:
135
fully_present = tuple((versioned[x] and kind[x] is not None) for
137
if fully_present[0] != fully_present[1]:
138
if fully_present[1] is True:
139
delta.added.append((path[1], file_id, kind[1]))
267
# The ids don't match, so we have to handle them both
269
if old_file_id is not None:
270
handle_old(old_path, old_entry)
272
if new_file_id is not None:
273
handle_new(new_path, new_entry)
275
# The two entries were at the same path, so increment both sides
276
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
277
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
278
elif new_path is None or (old_path is not None and old_path < new_path):
279
# Assume we don't match, only process old_path
280
if old_file_id is not None:
281
handle_old(old_path, old_entry)
282
# old_path came first, so increment it, trying to match up
283
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
284
elif new_path is not None:
285
# new_path came first, so increment it, trying to match up
286
if new_file_id is not None:
287
handle_new(new_path, new_entry)
288
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
290
# Now we have a set of added and removed files, mark them all
291
for old_path, old_entry in removed.itervalues():
292
if specific_file_ids:
293
if not old_entry.file_id in specific_file_ids:
295
delta.removed.append((old_path, old_entry.file_id, old_entry.kind))
296
for new_path, new_entry in added.itervalues():
297
if specific_file_ids:
298
if not new_entry.file_id in specific_file_ids:
300
delta.added.append((new_path, new_entry.file_id, new_entry.kind))
141
delta.removed.append((path[0], file_id, kind[0]))
142
elif fully_present[0] is False:
144
elif name[0] != name[1] or parent_id[0] != parent_id[1]:
145
# If the name changes, or the parent_id changes, we have a rename
146
# (if we move a parent, that doesn't count as a rename for the
148
delta.renamed.append((path[0],
153
(executable[0] != executable[1])))
154
elif kind[0] != kind[1]:
155
delta.kind_changed.append((path[1], file_id, kind[0], kind[1]))
156
elif content_change or executable[0] != executable[1]:
157
delta.modified.append((path[1], file_id, kind[1],
159
(executable[0] != executable[1])))
161
delta.unchanged.append((path[1], file_id, kind[1]))
302
163
delta.removed.sort()
303
164
delta.added.sort()
308
169
delta.unchanged.sort()
174
class _ChangeReporter(object):
175
"""Report changes between two trees"""
177
def __init__(self, output=None, suppress_root_add=True,
178
output_file=None, unversioned_filter=None, view_info=None):
181
:param output: a function with the signature of trace.note, i.e.
182
accepts a format and parameters.
183
:param supress_root_add: If true, adding the root will be ignored
184
(i.e. when a tree has just been initted)
185
:param output_file: If supplied, a file-like object to write to.
186
Only one of output and output_file may be supplied.
187
:param unversioned_filter: A filter function to be called on
188
unversioned files. This should return True to ignore a path.
189
By default, no filtering takes place.
190
:param view_info: A tuple of view_name,view_files if only
191
items inside a view are to be reported on, or None for
194
if output_file is not None:
195
if output is not None:
196
raise BzrError('Cannot specify both output and output_file')
197
def output(fmt, *args):
198
output_file.write((fmt % args) + '\n')
200
if self.output is None:
201
from bzrlib import trace
202
self.output = trace.note
203
self.suppress_root_add = suppress_root_add
204
self.modified_map = {'kind changed': 'K',
209
self.versioned_map = {'added': '+', # versioned target
210
'unchanged': ' ', # versioned in both
211
'removed': '-', # versioned in source
212
'unversioned': '?', # versioned in neither
214
self.unversioned_filter = unversioned_filter
215
if view_info is None:
216
self.view_name = None
219
self.view_name = view_info[0]
220
self.view_files = view_info[1]
221
self.output("Operating on whole tree but only reporting on "
222
"'%s' view." % (self.view_name,))
224
def report(self, file_id, paths, versioned, renamed, modified, exe_change,
226
"""Report one change to a file
228
:param file_id: The file_id of the file
229
:param path: The old and new paths as generated by Tree.iter_changes.
230
:param versioned: may be 'added', 'removed', 'unchanged', or
232
:param renamed: may be True or False
233
:param modified: may be 'created', 'deleted', 'kind changed',
234
'modified' or 'unchanged'.
235
:param exe_change: True if the execute bit has changed
236
:param kind: A pair of file kinds, as generated by Tree.iter_changes.
237
None indicates no file present.
241
if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
243
if self.view_files and not osutils.is_inside_any(self.view_files,
246
if versioned == 'unversioned':
247
# skip ignored unversioned files if needed.
248
if self.unversioned_filter is not None:
249
if self.unversioned_filter(paths[1]):
251
# dont show a content change in the output.
252
modified = 'unchanged'
253
# we show both paths in the following situations:
254
# the file versioning is unchanged AND
255
# ( the path is different OR
256
# the kind is different)
257
if (versioned == 'unchanged' and
258
(renamed or modified == 'kind changed')):
260
# on a rename, we show old and new
261
old_path, path = paths
263
# if it's not renamed, we're showing both for kind changes
264
# so only show the new path
265
old_path, path = paths[1], paths[1]
266
# if the file is not missing in the source, we show its kind
267
# when we show two paths.
268
if kind[0] is not None:
269
old_path += osutils.kind_marker(kind[0])
271
elif versioned == 'removed':
272
# not present in target
281
rename = self.versioned_map[versioned]
282
# we show the old kind on the new path when the content is deleted.
283
if modified == 'deleted':
284
path += osutils.kind_marker(kind[0])
285
# otherwise we always show the current kind when there is one
286
elif kind[1] is not None:
287
path += osutils.kind_marker(kind[1])
292
self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
295
def report_changes(change_iterator, reporter):
296
"""Report the changes from a change iterator.
298
This is essentially a translation from low-level to medium-level changes.
299
Further processing may be required to produce a human-readable output.
300
Unfortunately, some tree-changing operations are very complex
301
:change_iterator: an iterator or sequence of changes in the format
302
generated by Tree.iter_changes
303
:param reporter: The _ChangeReporter that will report the changes.
305
versioned_change_map = {
306
(True, True) : 'unchanged',
307
(True, False) : 'removed',
308
(False, True) : 'added',
309
(False, False): 'unversioned',
311
for (file_id, path, content_change, versioned, parent_id, name, kind,
312
executable) in change_iterator:
314
# files are "renamed" if they are moved or if name changes, as long
316
if None not in name and None not in parent_id and\
317
(name[0] != name[1] or parent_id[0] != parent_id[1]):
321
if kind[0] != kind[1]:
324
elif kind[1] is None:
327
modified = "kind changed"
330
modified = "modified"
332
modified = "unchanged"
333
if kind[1] == "file":
334
exe_change = (executable[0] != executable[1])
335
versioned_change = versioned_change_map[versioned]
336
reporter.report(file_id, path, versioned_change, renamed, modified,
339
def report_delta(to_file, delta, short_status=False, show_ids=False,
340
show_unchanged=False, indent='', filter=None):
341
"""Output this delta in status-like form to to_file.
343
:param to_file: A file-like object where the output is displayed.
345
:param delta: A TreeDelta containing the changes to be displayed
347
:param short_status: Single-line status if True.
349
:param show_ids: Output the file ids if True.
351
:param show_unchanged: Output the unchanged files if True.
353
:param indent: Added at the beginning of all output lines (for merged
356
:param filter: A callable receiving a path and a file id and
357
returning True if the path should be displayed.
360
def decorate_path(path, kind, meta_modified=None):
361
if kind == 'directory':
363
elif kind == 'symlink':
369
def show_more_renamed(item):
370
(oldpath, file_id, kind,
371
text_modified, meta_modified, newpath) = item
372
dec_new_path = decorate_path(newpath, kind, meta_modified)
373
to_file.write(' => %s' % dec_new_path)
374
if text_modified or meta_modified:
375
extra_modified.append((newpath, file_id, kind,
376
text_modified, meta_modified))
378
def show_more_kind_changed(item):
379
(path, file_id, old_kind, new_kind) = item
380
to_file.write(' (%s => %s)' % (old_kind, new_kind))
382
def show_path(path, file_id, kind, meta_modified,
383
default_format, with_file_id_format):
384
dec_path = decorate_path(path, kind, meta_modified)
386
to_file.write(with_file_id_format % dec_path)
388
to_file.write(default_format % dec_path)
390
def show_list(files, long_status_name, short_status_letter,
391
default_format='%s', with_file_id_format='%-30s',
396
prefix = short_status_letter
399
prefix = indent + prefix + ' '
402
path, file_id, kind = item[:3]
403
if (filter is not None and not filter(path, file_id)):
405
if not header_shown and not short_status:
406
to_file.write(indent + long_status_name + ':\n')
410
meta_modified = item[4]
412
to_file.write(prefix)
413
show_path(path, file_id, kind, meta_modified,
414
default_format, with_file_id_format)
415
if show_more is not None:
418
to_file.write(' %s' % file_id)
421
show_list(delta.removed, 'removed', 'D')
422
show_list(delta.added, 'added', 'A')
424
# Reorder delta.renamed tuples so that all lists share the same
425
# order for their 3 first fields and that they also begin like
426
# the delta.modified tuples
427
renamed = [(p, i, k, tm, mm, np)
428
for p, np, i, k, tm, mm in delta.renamed]
429
show_list(renamed, 'renamed', 'R', with_file_id_format='%s',
430
show_more=show_more_renamed)
431
show_list(delta.kind_changed, 'kind changed', 'K',
432
with_file_id_format='%s',
433
show_more=show_more_kind_changed)
434
show_list(delta.modified + extra_modified, 'modified', 'M')
436
show_list(delta.unchanged, 'unchanged', 'S')
438
show_list(delta.unversioned, 'unknown', ' ')
added
removed
bzrlib/delta.py
