102
85
for v in self.renamed:
103
86
if v[2] == file_id:
105
for v in self.kind_changed:
111
def show(self, to_file, show_ids=False, show_unchanged=False,
112
short_status=False, indent='',
114
"""Output this delta in status-like form to to_file.
116
:param to_file: A file-like object where the output is displayed.
118
:param show_ids: Output the file ids if True.
120
:param show_unchanged: Output the unchanged files if True.
122
:param short_status: Single-line status if True.
124
:param indent: Added at the beginning of all output lines (for merged
127
:param filter: A callable receiving a path and a file id and
128
returning True if the path should be displayed.
131
def decorate_path(path, kind, meta_modified=None):
132
if kind == 'directory':
134
elif kind == 'symlink':
140
def show_more_renamed(item):
141
(oldpath, file_id, kind,
142
text_modified, meta_modified, newpath) = item
143
dec_new_path = decorate_path(newpath, kind, meta_modified)
144
to_file.write(' => %s' % dec_new_path)
145
if text_modified or meta_modified:
146
extra_modified.append((newpath, file_id, kind,
91
def show(self, to_file, show_ids=False, show_unchanged=False):
94
path, fid, kind = item[:3]
96
if kind == 'directory':
98
elif kind == 'symlink':
101
if len(item) == 5 and item[4]:
105
print >>to_file, ' %-30s %s' % (path, fid)
107
print >>to_file, ' ', path
110
print >>to_file, 'removed:'
111
show_list(self.removed)
114
print >>to_file, 'added:'
115
show_list(self.added)
118
print >>to_file, 'renamed:'
119
for (oldpath, newpath, fid, kind,
120
text_modified, meta_modified) in self.renamed:
124
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
126
print >>to_file, ' %s => %s' % (oldpath, newpath)
129
print >>to_file, 'modified:'
130
show_list(self.modified)
132
if show_unchanged and self.unchanged:
133
print >>to_file, 'unchanged:'
134
show_list(self.unchanged)
138
def compare_trees(old_tree, new_tree, want_unchanged=False, specific_files=None):
139
"""Describe changes from one tree to another.
141
Returns a TreeDelta with details of added, modified, renamed, and
144
The root entry is specifically exempt.
146
This only considers versioned files.
149
If true, also list files unchanged from one version to
153
If true, only check for changes to specified names or
157
from osutils import is_inside_any
159
old_inv = old_tree.inventory
160
new_inv = new_tree.inventory
162
mutter('start compare_trees')
164
# TODO: match for specific files can be rather smarter by finding
165
# the IDs of those files up front and then considering only that.
167
for file_id in old_tree:
168
if file_id in new_tree:
169
old_ie = old_inv[file_id]
170
new_ie = new_inv[file_id]
173
assert kind == new_ie.kind
175
assert kind in InventoryEntry.known_kinds, \
176
'invalid file kind %r' % kind
178
if kind == 'root_directory':
182
if (not is_inside_any(specific_files, old_inv.id2path(file_id))
183
and not is_inside_any(specific_files, new_inv.id2path(file_id))):
186
# temporary hack until all entries are populated before clients
188
old_path = old_inv.id2path(file_id)
189
new_path = new_inv.id2path(file_id)
190
old_ie._read_tree_state(old_path, old_tree)
191
new_ie._read_tree_state(new_path, new_tree)
192
text_modified, meta_modified = new_ie.detect_changes(old_ie)
194
# TODO: Can possibly avoid calculating path strings if the
195
# two files are unchanged and their names and parents are
196
# the same and the parents are unchanged all the way up.
197
# May not be worthwhile.
199
if (old_ie.name != new_ie.name
200
or old_ie.parent_id != new_ie.parent_id):
201
delta.renamed.append((old_path,
204
text_modified, meta_modified))
205
elif text_modified or meta_modified:
206
delta.modified.append((new_path, file_id, kind,
147
207
text_modified, meta_modified))
149
def show_more_kind_changed(item):
150
(path, file_id, old_kind, new_kind) = item
151
to_file.write(' (%s => %s)' % (old_kind, new_kind))
153
def show_path(path, file_id, kind, meta_modified,
154
default_format, with_file_id_format):
155
dec_path = decorate_path(path, kind, meta_modified)
157
to_file.write(with_file_id_format % dec_path)
159
to_file.write(default_format % dec_path)
161
def show_list(files, long_status_name, short_status_letter,
162
default_format='%s', with_file_id_format='%-30s',
167
prefix = short_status_letter
170
prefix = indent + prefix + ' '
173
path, file_id, kind = item[:3]
174
if (filter is not None and not filter(path, file_id)):
176
if not header_shown and not short_status:
177
to_file.write(indent + long_status_name + ':\n')
181
meta_modified = item[4]
183
to_file.write(prefix)
184
show_path(path, file_id, kind, meta_modified,
185
default_format, with_file_id_format)
186
if show_more is not None:
189
to_file.write(' %s' % file_id)
192
show_list(self.removed, 'removed', 'D')#
193
show_list(self.added, 'added', 'A')
195
# Reorder self.renamed tuples so that all lists share the same
196
# order for their 3 first fields and that they also begin like
197
# the self.modified tuples
198
renamed = [(p, i, k, tm, mm, np)
199
for p, np, i, k, tm, mm in self.renamed]
200
show_list(renamed, 'renamed', 'R', with_file_id_format='%s',
201
show_more=show_more_renamed)
202
show_list(self.kind_changed, 'kind changed', 'K',
203
with_file_id_format='%s',
204
show_more=show_more_kind_changed)
205
show_list(self.modified + extra_modified, 'modified', 'M')
207
show_list(self.unchanged, 'unchanged', 'S')
209
show_list(self.unversioned, 'unknown', ' ')
211
def get_changes_as_text(self, show_ids=False, show_unchanged=False,
214
output = StringIO.StringIO()
215
self.show(output, show_ids, show_unchanged, short_status)
216
return output.getvalue()
219
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
220
include_root, extra_trees=None,
221
require_versioned=False, want_unversioned=False):
222
"""Worker function that implements Tree.changes_from."""
224
# mutter('start compare_trees')
226
for (file_id, path, content_change, versioned, parent_id, name, kind,
227
executable) in new_tree.iter_changes(old_tree, want_unchanged,
228
specific_files, extra_trees=extra_trees,
229
require_versioned=require_versioned,
230
want_unversioned=want_unversioned):
231
if versioned == (False, False):
232
delta.unversioned.append((path[1], None, kind[1]))
234
if not include_root and (None, None) == parent_id:
236
fully_present = tuple((versioned[x] and kind[x] is not None) for
238
if fully_present[0] != fully_present[1]:
239
if fully_present[1] is True:
240
delta.added.append((path[1], file_id, kind[1]))
242
delta.removed.append((path[0], file_id, kind[0]))
243
elif fully_present[0] is False:
245
elif name[0] != name[1] or parent_id[0] != parent_id[1]:
246
# If the name changes, or the parent_id changes, we have a rename
247
# (if we move a parent, that doesn't count as a rename for the
249
delta.renamed.append((path[0],
254
(executable[0] != executable[1])))
255
elif kind[0] != kind[1]:
256
delta.kind_changed.append((path[1], file_id, kind[0], kind[1]))
257
elif content_change or executable[0] != executable[1]:
258
delta.modified.append((path[1], file_id, kind[1],
260
(executable[0] != executable[1])))
209
delta.unchanged.append((new_path, file_id, kind))
262
delta.unchanged.append((path[1], file_id, kind[1]))
211
kind = old_inv.get_file_kind(file_id)
212
if kind == 'root_directory':
214
old_path = old_inv.id2path(file_id)
216
if not is_inside_any(specific_files, old_path):
218
delta.removed.append((old_path, file_id, kind))
220
mutter('start looking for new files')
221
for file_id in new_inv:
222
if file_id in old_inv:
224
kind = new_inv.get_file_kind(file_id)
225
if kind == 'root_directory':
227
new_path = new_inv.id2path(file_id)
229
if not is_inside_any(specific_files, new_path):
231
delta.added.append((new_path, file_id, kind))
264
233
delta.removed.sort()
265
234
delta.added.sort()
266
235
delta.renamed.sort()
267
# TODO: jam 20060529 These lists shouldn't need to be sorted
268
# since we added them in alphabetical order.
269
236
delta.modified.sort()
270
237
delta.unchanged.sort()
275
class _ChangeReporter(object):
276
"""Report changes between two trees"""
278
def __init__(self, output=None, suppress_root_add=True,
279
output_file=None, unversioned_filter=None, view_info=None):
282
:param output: a function with the signature of trace.note, i.e.
283
accepts a format and parameters.
284
:param supress_root_add: If true, adding the root will be ignored
285
(i.e. when a tree has just been initted)
286
:param output_file: If supplied, a file-like object to write to.
287
Only one of output and output_file may be supplied.
288
:param unversioned_filter: A filter function to be called on
289
unversioned files. This should return True to ignore a path.
290
By default, no filtering takes place.
291
:param view_info: A tuple of view_name,view_files if only
292
items inside a view are to be reported on, or None for
295
if output_file is not None:
296
if output is not None:
297
raise BzrError('Cannot specify both output and output_file')
298
def output(fmt, *args):
299
output_file.write((fmt % args) + '\n')
301
if self.output is None:
302
from bzrlib import trace
303
self.output = trace.note
304
self.suppress_root_add = suppress_root_add
305
self.modified_map = {'kind changed': 'K',
310
self.versioned_map = {'added': '+', # versioned target
311
'unchanged': ' ', # versioned in both
312
'removed': '-', # versioned in source
313
'unversioned': '?', # versioned in neither
315
self.unversioned_filter = unversioned_filter
316
if view_info is None:
317
self.view_name = None
320
self.view_name = view_info[0]
321
self.view_files = view_info[1]
322
self.output("Operating on whole tree but only reporting on "
323
"'%s' view." % (self.view_name,))
325
def report(self, file_id, paths, versioned, renamed, modified, exe_change,
327
"""Report one change to a file
329
:param file_id: The file_id of the file
330
:param path: The old and new paths as generated by Tree.iter_changes.
331
:param versioned: may be 'added', 'removed', 'unchanged', or
333
:param renamed: may be True or False
334
:param modified: may be 'created', 'deleted', 'kind changed',
335
'modified' or 'unchanged'.
336
:param exe_change: True if the execute bit has changed
337
:param kind: A pair of file kinds, as generated by Tree.iter_changes.
338
None indicates no file present.
342
if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
344
if self.view_files and not osutils.is_inside_any(self.view_files,
347
if versioned == 'unversioned':
348
# skip ignored unversioned files if needed.
349
if self.unversioned_filter is not None:
350
if self.unversioned_filter(paths[1]):
352
# dont show a content change in the output.
353
modified = 'unchanged'
354
# we show both paths in the following situations:
355
# the file versioning is unchanged AND
356
# ( the path is different OR
357
# the kind is different)
358
if (versioned == 'unchanged' and
359
(renamed or modified == 'kind changed')):
361
# on a rename, we show old and new
362
old_path, path = paths
364
# if it's not renamed, we're showing both for kind changes
365
# so only show the new path
366
old_path, path = paths[1], paths[1]
367
# if the file is not missing in the source, we show its kind
368
# when we show two paths.
369
if kind[0] is not None:
370
old_path += osutils.kind_marker(kind[0])
372
elif versioned == 'removed':
373
# not present in target
382
rename = self.versioned_map[versioned]
383
# we show the old kind on the new path when the content is deleted.
384
if modified == 'deleted':
385
path += osutils.kind_marker(kind[0])
386
# otherwise we always show the current kind when there is one
387
elif kind[1] is not None:
388
path += osutils.kind_marker(kind[1])
393
self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
397
def report_changes(change_iterator, reporter):
398
"""Report the changes from a change iterator.
400
This is essentially a translation from low-level to medium-level changes.
401
Further processing may be required to produce a human-readable output.
402
Unfortunately, some tree-changing operations are very complex
403
:change_iterator: an iterator or sequence of changes in the format
404
generated by Tree.iter_changes
405
:param reporter: The _ChangeReporter that will report the changes.
407
versioned_change_map = {
408
(True, True) : 'unchanged',
409
(True, False) : 'removed',
410
(False, True) : 'added',
411
(False, False): 'unversioned',
413
for (file_id, path, content_change, versioned, parent_id, name, kind,
414
executable) in change_iterator:
416
# files are "renamed" if they are moved or if name changes, as long
418
if None not in name and None not in parent_id and\
419
(name[0] != name[1] or parent_id[0] != parent_id[1]):
423
if kind[0] != kind[1]:
426
elif kind[1] is None:
429
modified = "kind changed"
432
modified = "modified"
434
modified = "unchanged"
435
if kind[1] == "file":
436
exe_change = (executable[0] != executable[1])
437
versioned_change = versioned_change_map[versioned]
438
reporter.report(file_id, path, versioned_change, renamed, modified,
added
removed
bzrlib/delta.py
