87
99
for v in self.renamed:
88
100
if v[2] == file_id:
102
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
def compare_trees(old_tree, new_tree, want_unchanged=False,
147
specific_files=None, extra_trees=None,
148
require_versioned=False):
149
"""Describe changes from one tree to another.
151
Returns a TreeDelta with details of added, modified, renamed, and
154
The root entry is specifically exempt.
156
This only considers versioned files.
159
If true, also list files unchanged from one version to
163
If supplied, only check for changes to specified names or
164
files within them. When mapping filenames to ids, all matches in all
165
trees (including optional extra_trees) are used, and all children of
166
matched directories are included.
169
If non-None, a list of more trees to use for looking up file_ids from
173
If true, an all files are required to be versioned, and
174
PathsNotVersionedError will be thrown if they are not.
176
# NB: show_status depends on being able to pass in non-versioned files and
177
# report them as unknown
182
trees = (new_tree, old_tree)
183
if extra_trees is not None:
184
trees = trees + tuple(extra_trees)
185
specific_file_ids = tree.find_ids_across_trees(specific_files,
186
trees, require_versioned=require_versioned)
187
return _compare_trees(old_tree, new_tree, want_unchanged,
195
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids):
197
from osutils import is_inside_any
199
old_inv = old_tree.inventory
200
new_inv = new_tree.inventory
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()
115
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
116
include_root, extra_trees=None,
117
require_versioned=False, want_unversioned=False):
118
"""Worker function that implements Tree.changes_from."""
201
119
delta = TreeDelta()
202
mutter('start compare_trees')
204
# TODO: Rather than iterating over the whole tree and then filtering, we
205
# could diff just the specified files (if any) and their subtrees.
207
old_files = old_tree.list_files()
208
new_files = new_tree.list_files()
219
except StopIteration:
220
return None, None, None, None, None
221
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
222
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
225
def check_matching(old_path, old_entry, new_path, new_entry):
226
"""We have matched up 2 file_ids, check for changes."""
227
assert old_entry.kind == new_entry.kind
229
if old_entry.kind == 'root_directory':
232
if specific_file_ids:
233
if (old_file_id not in specific_file_ids and
234
new_file_id not in specific_file_ids):
237
# temporary hack until all entries are populated before clients
239
old_entry._read_tree_state(old_path, old_tree)
240
new_entry._read_tree_state(new_path, new_tree)
241
text_modified, meta_modified = new_entry.detect_changes(old_entry)
243
# If the name changes, or the parent_id changes, we have a rename
244
# (if we move a parent, that doesn't count as a rename for the file)
245
if (old_entry.name != new_entry.name
246
or old_entry.parent_id != new_entry.parent_id):
247
delta.renamed.append((old_path,
249
old_entry.file_id, old_entry.kind,
250
text_modified, meta_modified))
251
elif text_modified or meta_modified:
252
delta.modified.append((new_path, new_entry.file_id, new_entry.kind,
253
text_modified, meta_modified))
255
delta.unchanged.append((new_path, new_entry.file_id, new_entry.kind))
258
def handle_old(path, entry):
259
"""old entry without a new entry match
261
Check to see if a matching new entry was already seen as an
262
added file, and switch the pair into being a rename.
263
Otherwise just mark the old entry being removed.
265
if entry.file_id in added:
266
# Actually this is a rename, we found a new file_id earlier
267
# at a different location, so it is no-longer added
268
x_new_path, x_new_entry = added.pop(entry.file_id)
269
check_matching(path, entry, x_new_path, x_new_entry)
271
# We have an old_file_id which doesn't line up with a new_file_id
272
# So this file looks to be removed
273
assert entry.file_id not in removed
274
removed[entry.file_id] = path, entry
276
def handle_new(path, entry):
277
"""new entry without an old entry match
279
Check to see if a matching old entry was already seen as a
280
removal, and change the pair into a rename.
281
Otherwise just mark the new entry as an added file.
283
if entry.file_id in removed:
284
# We saw this file_id earlier at an old different location
285
# it is no longer removed, just renamed
286
x_old_path, x_old_entry = removed.pop(entry.file_id)
287
check_matching(x_old_path, x_old_entry, path, entry)
289
# We have a new file which does not match an old file
291
assert entry.file_id not in added
292
added[entry.file_id] = path, entry
294
while old_path or new_path:
295
# list_files() returns files in alphabetical path sorted order
296
if old_path == new_path:
297
if old_file_id == new_file_id:
298
# This is the common case, the files are in the same place
299
# check if there were any content changes
301
if old_file_id is None:
302
# We have 2 unversioned files, no deltas possible???
305
check_matching(old_path, old_entry, new_path, new_entry)
120
# mutter('start compare_trees')
122
for (file_id, path, content_change, versioned, parent_id, name, kind,
123
executable) in new_tree.iter_changes(old_tree, want_unchanged,
124
specific_files, extra_trees=extra_trees,
125
require_versioned=require_versioned,
126
want_unversioned=want_unversioned):
127
if versioned == (False, False):
128
delta.unversioned.append((path[1], None, kind[1]))
130
if not include_root and (None, None) == parent_id:
132
fully_present = tuple((versioned[x] and kind[x] is not None) for
134
if fully_present[0] != fully_present[1]:
135
if fully_present[1] is True:
136
delta.added.append((path[1], file_id, kind[1]))
307
# The ids don't match, so we have to handle them both
309
if old_file_id is not None:
310
handle_old(old_path, old_entry)
312
if new_file_id is not None:
313
handle_new(new_path, new_entry)
315
# The two entries were at the same path, so increment both sides
316
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
317
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
318
elif new_path is None or (old_path is not None and old_path < new_path):
319
# Assume we don't match, only process old_path
320
if old_file_id is not None:
321
handle_old(old_path, old_entry)
322
# old_path came first, so increment it, trying to match up
323
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
324
elif new_path is not None:
325
# new_path came first, so increment it, trying to match up
326
if new_file_id is not None:
327
handle_new(new_path, new_entry)
328
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
330
# Now we have a set of added and removed files, mark them all
331
for old_path, old_entry in removed.itervalues():
332
if specific_file_ids:
333
if not old_entry.file_id in specific_file_ids:
335
delta.removed.append((old_path, old_entry.file_id, old_entry.kind))
336
for new_path, new_entry in added.itervalues():
337
if specific_file_ids:
338
if not new_entry.file_id in specific_file_ids:
340
delta.added.append((new_path, new_entry.file_id, new_entry.kind))
138
delta.removed.append((path[0], file_id, kind[0]))
139
elif fully_present[0] is False:
141
elif name[0] != name[1] or parent_id[0] != parent_id[1]:
142
# If the name changes, or the parent_id changes, we have a rename
143
# (if we move a parent, that doesn't count as a rename for the
145
delta.renamed.append((path[0],
150
(executable[0] != executable[1])))
151
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],
156
(executable[0] != executable[1])))
158
delta.unchanged.append((path[1], file_id, kind[1]))
342
160
delta.removed.sort()
343
161
delta.added.sort()
348
166
delta.unchanged.sort()
171
class _ChangeReporter(object):
172
"""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):
178
:param output: a function with the signature of trace.note, i.e.
179
accepts a format and parameters.
180
:param supress_root_add: If true, adding the root will be ignored
181
(i.e. when a tree has just been initted)
182
:param output_file: If supplied, a file-like object to write to.
183
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
191
if output_file is not None:
192
if output is not None:
193
raise BzrError('Cannot specify both output and output_file')
194
def output(fmt, *args):
195
output_file.write((fmt % args) + '\n')
197
if self.output is None:
198
from bzrlib import trace
199
self.output = trace.note
200
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,
223
"""Report one change to a file
225
: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
229
:param renamed: may be True or False
230
:param modified: may be 'created', 'deleted', 'kind changed',
231
'modified' or 'unchanged'.
232
:param exe_change: True if the execute bit has changed
233
:param kind: A pair of file kinds, as generated by Tree.iter_changes.
234
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
278
rename = self.versioned_map[versioned]
279
# we show the old kind on the new path when the content is deleted.
280
if modified == 'deleted':
281
path += osutils.kind_marker(kind[0])
282
# otherwise we always show the current kind when there is one
283
elif kind[1] is not None:
284
path += osutils.kind_marker(kind[1])
289
self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
292
def report_changes(change_iterator, reporter):
293
"""Report the changes from a change iterator.
295
This is essentially a translation from low-level to medium-level changes.
296
Further processing may be required to produce a human-readable output.
297
Unfortunately, some tree-changing operations are very complex
298
: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.
302
versioned_change_map = {
303
(True, True) : 'unchanged',
304
(True, False) : 'removed',
305
(False, True) : 'added',
306
(False, False): 'unversioned',
308
for (file_id, path, content_change, versioned, parent_id, name, kind,
309
executable) in change_iterator:
311
# files are "renamed" if they are moved or if name changes, as long
313
if None not in name and None not in parent_id and\
314
(name[0] != name[1] or parent_id[0] != parent_id[1]):
318
if kind[0] != kind[1]:
321
elif kind[1] is None:
324
modified = "kind changed"
327
modified = "modified"
329
modified = "unchanged"
330
if kind[1] == "file":
331
exe_change = (executable[0] != executable[1])
332
versioned_change = versioned_change_map[versioned]
333
reporter.report(file_id, path, versioned_change, renamed, modified,
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
