86
102
for v in self.renamed:
87
103
if v[2] == file_id:
105
for v in self.kind_changed:
92
def show(self, to_file, show_ids=False, show_unchanged=False):
95
path, fid, kind = item[:3]
97
if kind == 'directory':
99
elif kind == 'symlink':
102
if len(item) == 5 and item[4]:
106
print >>to_file, ' %-30s %s' % (path, fid)
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,
147
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
108
print >>to_file, ' ', path
111
print >>to_file, 'removed:'
112
show_list(self.removed)
115
print >>to_file, 'added:'
116
show_list(self.added)
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')
118
194
extra_modified = []
121
print >>to_file, 'renamed:'
122
for (oldpath, newpath, fid, kind,
123
text_modified, meta_modified) in self.renamed:
124
if text_modified or meta_modified:
125
extra_modified.append((newpath, fid, kind,
126
text_modified, meta_modified))
130
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
132
print >>to_file, ' %s => %s' % (oldpath, newpath)
134
if self.modified or extra_modified:
135
print >>to_file, 'modified:'
136
show_list(self.modified)
137
show_list(extra_modified)
139
if show_unchanged and self.unchanged:
140
print >>to_file, 'unchanged:'
141
show_list(self.unchanged)
145
def compare_trees(old_tree, new_tree, want_unchanged=False, specific_files=None):
146
"""Describe changes from one tree to another.
148
Returns a TreeDelta with details of added, modified, renamed, and
151
The root entry is specifically exempt.
153
This only considers versioned files.
156
If true, also list files unchanged from one version to
160
If true, only check for changes to specified names or
161
files within them. Any unversioned files given have no effect
162
(but this might change in the future).
164
# NB: show_status depends on being able to pass in non-versioned files and
165
# report them as unknown
170
return _compare_trees(old_tree, new_tree, want_unchanged,
178
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files):
180
from osutils import is_inside_any
182
old_inv = old_tree.inventory
183
new_inv = new_tree.inventory
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."""
184
223
delta = TreeDelta()
185
mutter('start compare_trees')
187
# TODO: Rather than iterating over the whole tree and then filtering, we
188
# could diff just the specified files (if any) and their subtrees.
189
# Perhaps should take a list of file-ids instead? Need to indicate any
190
# ids or names which were not found in the trees.
192
old_files = old_tree.list_files()
193
new_files = new_tree.list_files()
204
except StopIteration:
205
return None, None, None, None, None
206
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
207
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
210
def check_matching(old_path, old_entry, new_path, new_entry):
211
"""We have matched up 2 file_ids, check for changes."""
212
assert old_entry.kind == new_entry.kind
214
if old_entry.kind == 'root_directory':
218
if (not is_inside_any(specific_files, old_path)
219
and not is_inside_any(specific_files, new_path)):
222
# temporary hack until all entries are populated before clients
224
old_entry._read_tree_state(old_path, old_tree)
225
new_entry._read_tree_state(new_path, new_tree)
226
text_modified, meta_modified = new_entry.detect_changes(old_entry)
228
# If the name changes, or the parent_id changes, we have a rename
229
# (if we move a parent, that doesn't count as a rename for the file)
230
if (old_entry.name != new_entry.name
231
or old_entry.parent_id != new_entry.parent_id):
232
delta.renamed.append((old_path,
234
old_entry.file_id, old_entry.kind,
235
text_modified, meta_modified))
236
elif text_modified or meta_modified:
237
delta.modified.append((new_path, new_entry.file_id, new_entry.kind,
238
text_modified, meta_modified))
240
delta.unchanged.append((new_path, new_entry.file_id, new_entry.kind))
243
def handle_old(path, entry):
244
"""old entry without a new entry match
246
Check to see if a matching new entry was already seen as an
247
added file, and switch the pair into being a rename.
248
Otherwise just mark the old entry being removed.
250
if entry.file_id in added:
251
# Actually this is a rename, we found a new file_id earlier
252
# at a different location, so it is no-longer added
253
x_new_path, x_new_entry = added.pop(entry.file_id)
254
check_matching(path, entry, x_new_path, x_new_entry)
256
# We have an old_file_id which doesn't line up with a new_file_id
257
# So this file looks to be removed
258
assert entry.file_id not in removed
259
removed[entry.file_id] = path, entry
261
def handle_new(path, entry):
262
"""new entry without an old entry match
264
Check to see if a matching old entry was already seen as a
265
removal, and change the pair into a rename.
266
Otherwise just mark the new entry as an added file.
268
if entry.file_id in removed:
269
# We saw this file_id earlier at an old different location
270
# it is no longer removed, just renamed
271
x_old_path, x_old_entry = removed.pop(entry.file_id)
272
check_matching(x_old_path, x_old_entry, path, entry)
274
# We have a new file which does not match an old file
276
assert entry.file_id not in added
277
added[entry.file_id] = path, entry
279
while old_path or new_path:
280
# list_files() returns files in alphabetical path sorted order
281
if old_path == new_path:
282
if old_file_id == new_file_id:
283
# This is the common case, the files are in the same place
284
# check if there were any content changes
286
if old_file_id is None:
287
# We have 2 unversioned files, no deltas possible???
290
check_matching(old_path, old_entry, new_path, new_entry)
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]))
292
# The ids don't match, so we have to handle them both
294
if old_file_id is not None:
295
handle_old(old_path, old_entry)
297
if new_file_id is not None:
298
handle_new(new_path, new_entry)
300
# The two entries were at the same path, so increment both sides
301
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
302
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
303
elif new_path is None or (old_path is not None and old_path < new_path):
304
# Assume we don't match, only process old_path
305
if old_file_id is not None:
306
handle_old(old_path, old_entry)
307
# old_path came first, so increment it, trying to match up
308
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
309
elif new_path is not None:
310
# new_path came first, so increment it, trying to match up
311
if new_file_id is not None:
312
handle_new(new_path, new_entry)
313
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
315
# Now we have a set of added and removed files, mark them all
316
for old_path, old_entry in removed.itervalues():
318
if not is_inside_any(specific_files, old_path):
320
delta.removed.append((old_path, old_entry.file_id, old_entry.kind))
321
for new_path, new_entry in added.itervalues():
323
if not is_inside_any(specific_files, new_path):
325
delta.added.append((new_path, new_entry.file_id, new_entry.kind))
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])))
262
delta.unchanged.append((path[1], file_id, kind[1]))
327
264
delta.removed.sort()
328
265
delta.added.sort()
333
270
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):
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.
292
if output_file is not None:
293
if output is not None:
294
raise BzrError('Cannot specify both output and output_file')
295
def output(fmt, *args):
296
output_file.write((fmt % args) + '\n')
298
if self.output is None:
299
from bzrlib import trace
300
self.output = trace.note
301
self.suppress_root_add = suppress_root_add
302
self.modified_map = {'kind changed': 'K',
307
self.versioned_map = {'added': '+', # versioned target
308
'unchanged': ' ', # versioned in both
309
'removed': '-', # versioned in source
310
'unversioned': '?', # versioned in neither
312
self.unversioned_filter = unversioned_filter
314
def report(self, file_id, paths, versioned, renamed, modified, exe_change,
316
"""Report one change to a file
318
:param file_id: The file_id of the file
319
:param path: The old and new paths as generated by Tree.iter_changes.
320
:param versioned: may be 'added', 'removed', 'unchanged', or
322
:param renamed: may be True or False
323
:param modified: may be 'created', 'deleted', 'kind changed',
324
'modified' or 'unchanged'.
325
:param exe_change: True if the execute bit has changed
326
:param kind: A pair of file kinds, as generated by Tree.iter_changes.
327
None indicates no file present.
331
if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
333
if versioned == 'unversioned':
334
# skip ignored unversioned files if needed.
335
if self.unversioned_filter is not None:
336
if self.unversioned_filter(paths[1]):
338
# dont show a content change in the output.
339
modified = 'unchanged'
340
# we show both paths in the following situations:
341
# the file versioning is unchanged AND
342
# ( the path is different OR
343
# the kind is different)
344
if (versioned == 'unchanged' and
345
(renamed or modified == 'kind changed')):
347
# on a rename, we show old and new
348
old_path, path = paths
350
# if it's not renamed, we're showing both for kind changes
351
# so only show the new path
352
old_path, path = paths[1], paths[1]
353
# if the file is not missing in the source, we show its kind
354
# when we show two paths.
355
if kind[0] is not None:
356
old_path += osutils.kind_marker(kind[0])
358
elif versioned == 'removed':
359
# not present in target
368
rename = self.versioned_map[versioned]
369
# we show the old kind on the new path when the content is deleted.
370
if modified == 'deleted':
371
path += osutils.kind_marker(kind[0])
372
# otherwise we always show the current kind when there is one
373
elif kind[1] is not None:
374
path += osutils.kind_marker(kind[1])
379
self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
383
def report_changes(change_iterator, reporter):
384
"""Report the changes from a change iterator.
386
This is essentially a translation from low-level to medium-level changes.
387
Further processing may be required to produce a human-readable output.
388
Unfortunately, some tree-changing operations are very complex
389
:change_iterator: an iterator or sequence of changes in the format
390
generated by Tree.iter_changes
391
:param reporter: The _ChangeReporter that will report the changes.
393
versioned_change_map = {
394
(True, True) : 'unchanged',
395
(True, False) : 'removed',
396
(False, True) : 'added',
397
(False, False): 'unversioned',
399
for (file_id, path, content_change, versioned, parent_id, name, kind,
400
executable) in change_iterator:
402
# files are "renamed" if they are moved or if name changes, as long
404
if None not in name and None not in parent_id and\
405
(name[0] != name[1] or parent_id[0] != parent_id[1]):
409
if kind[0] != kind[1]:
412
elif kind[1] is None:
415
modified = "kind changed"
418
modified = "modified"
420
modified = "unchanged"
421
if kind[1] == "file":
422
exe_change = (executable[0] != executable[1])
423
versioned_change = versioned_change_map[versioned]
424
reporter.report(file_id, path, versioned_change, renamed, modified,
added
removed
bzrlib/delta.py
