104
106
if v[1] == file_id:
109
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
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,
110
212
short_status=False):
111
"""output this delta in status-like form to to_file."""
112
def show_list(files, short_status_letter=''):
114
path, fid, kind = item[:3]
116
if kind == 'directory':
118
elif kind == 'symlink':
121
if len(item) == 5 and item[4]:
125
print >>to_file, '%s %-30s %s' % (short_status_letter,
128
print >>to_file, '%s %s' % (short_status_letter, path)
132
print >>to_file, 'removed:'
133
show_list(self.removed)
135
show_list(self.removed, 'D')
139
print >>to_file, 'added:'
140
show_list(self.added)
142
show_list(self.added, 'A')
147
short_status_letter = 'R'
149
print >>to_file, 'renamed:'
150
short_status_letter = ''
151
for (oldpath, newpath, fid, kind,
152
text_modified, meta_modified) in self.renamed:
153
if text_modified or meta_modified:
154
extra_modified.append((newpath, fid, kind,
155
text_modified, meta_modified))
159
print >>to_file, '%s %s => %s %s' % (
160
short_status_letter, oldpath, newpath, fid)
162
print >>to_file, '%s %s => %s' % (
163
short_status_letter, oldpath, newpath)
165
if self.kind_changed:
167
short_status_letter = 'K'
169
print >>to_file, 'kind changed:'
170
short_status_letter = ''
171
for (path, fid, old_kind, new_kind) in self.kind_changed:
176
print >>to_file, '%s %s (%s => %s)%s' % (
177
short_status_letter, path, old_kind, new_kind, suffix)
179
if self.modified or extra_modified:
180
short_status_letter = 'M'
182
print >>to_file, 'modified:'
183
short_status_letter = ''
184
show_list(self.modified, short_status_letter)
185
show_list(extra_modified, short_status_letter)
187
if show_unchanged and self.unchanged:
189
print >>to_file, 'unchanged:'
190
show_list(self.unchanged)
192
show_list(self.unchanged, 'S')
195
print >>to_file, 'unknown:'
196
show_list(self.unversioned)
199
@deprecated_function(zero_nine)
200
def compare_trees(old_tree, new_tree, want_unchanged=False,
201
specific_files=None, extra_trees=None,
202
require_versioned=False):
203
"""compare_trees was deprecated in 0.10. Please see Tree.changes_from."""
204
return new_tree.changes_from(old_tree,
205
want_unchanged=want_unchanged,
206
specific_files=specific_files,
207
extra_trees=extra_trees,
208
require_versioned=require_versioned,
214
output = StringIO.StringIO()
215
self.show(output, show_ids, show_unchanged, short_status)
216
return output.getvalue()
212
219
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
213
220
include_root, extra_trees=None,
214
want_unversioned=False):
221
require_versioned=False, want_unversioned=False):
215
222
"""Worker function that implements Tree.changes_from."""
216
223
delta = TreeDelta()
217
224
# mutter('start compare_trees')
219
226
for (file_id, path, content_change, versioned, parent_id, name, kind,
220
executable) in new_tree._iter_changes(old_tree, want_unchanged,
227
executable) in new_tree.iter_changes(old_tree, want_unchanged,
221
228
specific_files, extra_trees=extra_trees,
229
require_versioned=require_versioned,
222
230
want_unversioned=want_unversioned):
223
231
if versioned == (False, False):
224
232
delta.unversioned.append((path[1], None, kind[1]))
303
313
'unversioned': '?', # versioned in neither
305
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,))
307
325
def report(self, file_id, paths, versioned, renamed, modified, exe_change,
309
327
"""Report one change to a file
311
329
:param file_id: The file_id of the file
312
:param path: The old and new paths as generated by Tree._iter_changes.
330
:param path: The old and new paths as generated by Tree.iter_changes.
313
331
:param versioned: may be 'added', 'removed', 'unchanged', or
315
333
:param renamed: may be True or False
316
334
:param modified: may be 'created', 'deleted', 'kind changed',
317
335
'modified' or 'unchanged'.
318
336
:param exe_change: True if the execute bit has changed
319
:param kind: A pair of file kinds, as generated by Tree._iter_changes.
337
:param kind: A pair of file kinds, as generated by Tree.iter_changes.
320
338
None indicates no file present.
322
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,
324
347
if versioned == 'unversioned':
325
348
# skip ignored unversioned files if needed.
326
349
if self.unversioned_filter is not None: