« back to all changes in this revision
Viewing changes to bzrlib/delta.py
- browse files at revision 2255.7.96
- compare with another revision
- compare with revision 963
- download diff
- download tarball
- view history from revision 2255.7.96
- Committer: Robert Collins
- Date: 2007-03-05 01:15:25 UTC
- mto: (2255.11.4 dirstate)
- mto: This revision was merged to the branch mainline in revision 2322.
- Revision ID: robertc@robertcollins.net-20070305011525-fakb9irlbxyxaukb
Change _iter_changes interface to yield both old and new paths.
added
removed
bzrlib/delta.py
221
221
specific_files, extra_trees=extra_trees,
222
222
want_unversioned=want_unversioned):
223
223
if versioned == (False, False):
224
delta.unversioned.append((path, None, kind[1]))
224
delta.unversioned.append((path[1], None, kind[1]))
225
225
continue
226
226
if not include_root and (None, None) == parent_id:
227
227
continue
229
229
x in range(2))
230
230
if fully_present[0] != fully_present[1]:
231
231
if fully_present[1] is True:
232
delta.added.append((path, file_id, kind[1]))
232
delta.added.append((path[1], file_id, kind[1]))
233
233
else:
234
234
assert fully_present[0] is True
235
old_path = old_tree.id2path(file_id)
236
delta.removed.append((old_path, file_id, kind[0]))
235
delta.removed.append((path[0], file_id, kind[0]))
237
236
elif fully_present[0] is False:
238
237
continue
239
238
elif name[0] != name[1] or parent_id[0] != parent_id[1]:
240
239
# If the name changes, or the parent_id changes, we have a rename
241
240
# (if we move a parent, that doesn't count as a rename for the
242
241
# file)
243
old_path = old_tree.id2path(file_id)
244
delta.renamed.append((old_path,
245
path,
246
file_id,
242
delta.renamed.append((path[0],
243
path[1],
244
file_id,
247
245
kind[1],
248
content_change,
246
content_change,
249
247
(executable[0] != executable[1])))
250
248
elif kind[0] != kind[1]:
251
delta.kind_changed.append((path, file_id, kind[0], kind[1]))
249
delta.kind_changed.append((path[1], file_id, kind[0], kind[1]))
252
250
elif content_change is True or executable[0] != executable[1]:
253
delta.modified.append((path, file_id, kind[1],
254
content_change,
251
delta.modified.append((path[1], file_id, kind[1],
252
content_change,
255
253
(executable[0] != executable[1])))
256
254
else:
257
delta.unchanged.append((path, file_id, kind[1]))
255
delta.unchanged.append((path[1], file_id, kind[1]))
258
256
259
257
delta.removed.sort()
260
258
delta.added.sort()
270
268
class ChangeReporter(object):
271
269
"""Report changes between two trees"""
272
270
273
def __init__(self, old_inventory, output=None, suppress_root_add=True,
271
def __init__(self, output=None, suppress_root_add=True,
274
272
output_file=None):
275
273
"""Constructor
276
274
277
:param old_inventory: The inventory of the old tree
278
275
:param output: a function with the signature of trace.note, i.e.
279
276
accepts a format and parameters.
280
277
:param supress_root_add: If true, adding the root will be ignored
282
279
:param output_file: If supplied, a file-like object to write to.
283
280
Only one of output and output_file may be supplied.
284
281
"""
285
self.old_inventory = old_inventory
286
282
if output_file is not None:
287
283
if output is not None:
288
284
raise BzrError('Cannot specify both output and output_file')
293
289
from bzrlib import trace
294
290
self.output = trace.note
295
291
self.suppress_root_add = suppress_root_add
292
self.modified_map = {'kind changed': 'K',
293
'unchanged': ' ',
294
'created': 'N',
295
'modified': 'M',
296
'deleted': 'D'}
297
self.versioned_map = {'added': '+',
298
'unchanged': ' ',
299
'removed': '-'}
296
300
297
def report(self, file_id, path, versioned, renamed, modified, exe_change,
301
def report(self, file_id, paths, versioned, renamed, modified, exe_change,
298
302
kind):
299
303
"""Report one change to a file
300
304
301
305
:param file_id: The file_id of the file
302
:param path: The path the file has (or would have) in the tree (as
303
generated by Tree._iter_changes)
306
:param path: The old and new paths as generated by Tree._iter_changes.
304
307
:param versioned: may be 'added', 'removed', or 'unchanged'
305
308
:param renamed: may be True or False
306
309
:param modified: may be 'created', 'deleted', 'kind changed',
309
312
:param kind: A pair of file kinds, as generated by Tree._iter_changes.
310
313
None indicates no file present.
311
314
"""
312
if path == '' and versioned == 'added' and self.suppress_root_add:
315
if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
313
316
return
314
modified_map = {'kind changed': 'K',
315
'unchanged': ' ',
316
'created': 'N',
317
'modified': 'M',
318
'deleted': 'D'}
319
versioned_map = {'added': '+',
320
'unchanged': ' ',
321
'removed': '-'}
322
old_path = ""
317
# we show both paths in the following situations:
318
# the file versioning is unchanged AND
319
# ( the path is different OR
320
# the kind is different)
321
if (versioned == 'unchanged' and
322
(renamed or modified == 'kind changed')):
323
if renamed:
324
# on a rename, we show old and new
325
old_path, path = paths
326
else:
327
# if its not renamed, we're showing both for kind changes
328
# so only show the new path
329
old_path, path = paths[1], paths[1]
330
# if the file is not missing in the source, we show its kind
331
# when we show two paths.
332
if kind[0] is not None:
333
old_path += osutils.kind_marker(kind[0])
334
old_path += " => "
335
else:
336
old_path = ""
337
path = paths[1]
323
338
if renamed:
324
old_path = self.old_inventory.id2path(file_id)
325
339
rename = "R"
326
340
else:
327
rename = versioned_map[versioned]
328
if modified == 'kind changed':
329
if old_path == "":
330
old_path = path
341
rename = self.versioned_map[versioned]
342
# we show the old kind on the new path when the content is deleted.
331
343
if modified == 'deleted':
332
344
path += osutils.kind_marker(kind[0])
345
# otherwise we always show the current kind when there is one
333
346
elif kind[1] is not None:
334
347
path += osutils.kind_marker(kind[1])
335
if old_path != "":
336
if kind[0] is not None:
337
old_path += osutils.kind_marker(kind[0])
338
old_path += " => "
339
348
if exe_change:
340
349
exe = '*'
341
350
else:
342
351
exe = ' '
343
self.output("%s%s%s %s%s", rename, modified_map[modified], exe,
352
self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
344
353
old_path, path)
345
354
346
355
Loggerhead is a web-based interface for Breezy
Version: 2.0.1