/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/delta.py

  • Committer: Jelmer Vernooij
  • Date: 2019-08-11 13:21:03 UTC
  • mfrom: (7379 work)
  • mto: This revision was merged to the branch mainline in revision 7388.
  • Revision ID: jelmer@jelmer.uk-20190811132103-u3ne03yf37c1h57n
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/delta.py
386
386
    :param indent: Added at the beginning of all output lines (for merged
387
387
        revisions).
388
388
 
389
 
    :param predicate: A callable receiving a path and a file id and
390
 
        returning True if the path should be displayed.
 
389
    :param predicate: A callable receiving a path returning True if the path
 
390
        should be displayed.
391
391
 
392
392
    :param classify: Add special symbols to indicate file kind.
393
393
    """
416
416
        (path, file_id, old_kind, new_kind) = item
417
417
        to_file.write(' (%s => %s)' % (old_kind, new_kind))
418
418
 
419
 
    def show_path(path, file_id, kind, meta_modified,
 
419
    def show_path(path, kind, meta_modified,
420
420
                  default_format, with_file_id_format):
421
421
        dec_path = decorate_path(path, kind, meta_modified)
422
422
        if show_ids:
437
437
 
438
438
            for item in files:
439
439
                path, file_id, kind = item[:3]
440
 
                if (predicate is not None and not predicate(path, file_id)):
 
440
                if (predicate is not None and not predicate(path)):
441
441
                    continue
442
442
                if not header_shown and not short_status:
443
443
                    to_file.write(indent + long_status_name + ':\n')
447
447
                    meta_modified = item[4]
448
448
 
449
449
                to_file.write(prefix)
450
 
                show_path(path, file_id, kind, meta_modified,
 
450
                show_path(path, kind, meta_modified,
451
451
                          default_format, with_file_id_format)
452
452
                if show_more is not None:
453
453
                    show_more(item)