102
91
for v in self.renamed:
103
92
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,
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
97
def show(self, to_file, show_ids=False, show_unchanged=False, short_status=False):
98
"""output this delta in status-like form to to_file."""
99
def show_list(files, short_status_letter=''):
101
path, fid, kind = item[:3]
103
if kind == 'directory':
105
elif kind == 'symlink':
108
if len(item) == 5 and item[4]:
112
print >>to_file, '%s %-30s %s' % (short_status_letter, path, fid)
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')
114
print >>to_file, '%s %s' % (short_status_letter, path)
118
print >>to_file, 'removed:'
119
show_list(self.removed)
121
show_list(self.removed, 'D')
125
print >>to_file, 'added:'
126
show_list(self.added)
128
show_list(self.added, 'A')
194
130
extra_modified = []
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."""
133
short_status_letter = 'R'
135
print >>to_file, 'renamed:'
136
short_status_letter = ''
137
for (oldpath, newpath, fid, kind,
138
text_modified, meta_modified) in self.renamed:
139
if text_modified or meta_modified:
140
extra_modified.append((newpath, fid, kind,
141
text_modified, meta_modified))
145
print >>to_file, '%s %s => %s %s' % (short_status_letter,
146
oldpath, newpath, fid)
148
print >>to_file, '%s %s => %s' % (short_status_letter,
151
if self.modified or extra_modified:
152
short_status_letter = 'M'
154
print >>to_file, 'modified:'
155
short_status_letter = ''
156
show_list(self.modified, short_status_letter)
157
show_list(extra_modified, short_status_letter)
159
if show_unchanged and self.unchanged:
161
print >>to_file, 'unchanged:'
162
show_list(self.unchanged)
164
show_list(self.unchanged, 'S')
167
@deprecated_function(zero_nine)
168
def compare_trees(old_tree, new_tree, want_unchanged=False,
169
specific_files=None, extra_trees=None,
170
require_versioned=False):
171
"""compare_trees was deprecated in 0.10. Please see Tree.changes_from."""
172
return new_tree.changes_from(old_tree,
173
want_unchanged=want_unchanged,
174
specific_files=specific_files,
175
extra_trees=extra_trees,
176
require_versioned=require_versioned,
180
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids,
223
182
delta = TreeDelta()
224
183
# mutter('start compare_trees')
226
185
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]))
186
executable) in new_tree._iter_changes(old_tree, want_unchanged,
234
188
if not include_root and (None, None) == parent_id:
190
assert kind[0] == kind[1] or None in kind
191
# the only 'kind change' permitted is creation/deletion
236
192
fully_present = tuple((versioned[x] and kind[x] is not None) for
238
194
if fully_present[0] != fully_present[1]:
239
195
if fully_present[1] is True:
240
delta.added.append((path[1], file_id, kind[1]))
196
delta.added.append((path, file_id, kind[1]))
242
delta.removed.append((path[0], file_id, kind[0]))
198
assert fully_present[0] is True
199
old_path = old_tree.id2path(file_id)
200
delta.removed.append((old_path, file_id, kind[0]))
243
201
elif fully_present[0] is False:
245
203
elif name[0] != name[1] or parent_id[0] != parent_id[1]:
246
204
# If the name changes, or the parent_id changes, we have a rename
247
205
# (if we move a parent, that doesn't count as a rename for the
249
delta.renamed.append((path[0],
207
old_path = old_tree.id2path(file_id)
208
delta.renamed.append((old_path,
254
213
(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],
214
elif content_change is True or executable[0] != executable[1]:
215
delta.modified.append((path, file_id, kind[1],
260
217
(executable[0] != executable[1])))
262
delta.unchanged.append((path[1], file_id, kind[1]))
219
delta.unchanged.append((path, file_id, kind[1]))
264
221
delta.removed.sort()
265
222
delta.added.sort()
275
class _ChangeReporter(object):
232
class ChangeReporter(object):
276
233
"""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')
235
def __init__(self, old_inventory, output=None):
236
self.old_inventory = old_inventory
300
237
self.output = output
301
238
if self.output is None:
302
239
from bzrlib import trace
303
240
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,
242
def report(self, file_id, path, versioned, renamed, modified, exe_change,
327
244
"""Report one change to a file
329
246
: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
247
:param path: The path the file has (or would have) in the tree (as
248
generated by Tree._iter_changes)
249
:param versioned: may be 'added', 'removed', or 'unchanged'
333
250
:param renamed: may be True or False
334
251
:param modified: may be 'created', 'deleted', 'kind changed',
335
252
'modified' or 'unchanged'.
336
253
:param exe_change: True if the execute bit has changed
337
:param kind: A pair of file kinds, as generated by Tree.iter_changes.
254
:param kind: A pair of file kinds, as generated by Tree._iter_changes.
338
255
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
257
modified_map = {'kind changed': 'K',
262
versioned_map = {'added': '+',
267
old_path = self.old_inventory.id2path(file_id)
382
rename = self.versioned_map[versioned]
383
# we show the old kind on the new path when the content is deleted.
270
rename = versioned_map[versioned]
271
if modified == 'kind changed':
384
274
if modified == 'deleted':
385
275
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
277
path += osutils.kind_marker(kind[1])
279
old_path += "%s => " % osutils.kind_marker(kind[0])
393
self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
284
self.output("%s%s%s %s%s", rename, modified_map[modified], exe,