/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/log.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-09-21 16:35:59 UTC
  • mfrom: (7358.11.10 delta-no-file-ids)
  • Revision ID: breezy.the.bot@gmail.com-20190921163559-inw7zv0fg2j35h68
TreeDelta holds TreeChange objects rather than tuples of various sizes.

Merged from https://code.launchpad.net/~jelmer/brz/delta-no-file-ids/+merge/369480

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/log.py
1017
1017
    """
1018
1018
    if stop_on == 'add':
1019
1019
        for item in delta.added:
1020
 
            if item[1] in fileids:
1021
 
                fileids.remove(item[1])
 
1020
            if item.file_id in fileids:
 
1021
                fileids.remove(item.file_id)
1022
1022
    elif stop_on == 'delete':
1023
1023
        for item in delta.removed:
1024
 
            if item[1] in fileids:
1025
 
                fileids.remove(item[1])
 
1024
            if item.file_id in fileids:
 
1025
                fileids.remove(item.file_id)
1026
1026
 
1027
1027
 
1028
1028
def _make_revision_objects(branch, generate_delta, search, log_rev_iterator):
1794
1794
 
1795
1795
        if revision.delta is not None and revision.delta.has_changed():
1796
1796
            for c in revision.delta.added + revision.delta.removed + revision.delta.modified:
1797
 
                path, = c[:1]
 
1797
                if c.path[0] is None:
 
1798
                    path = c.path[1]
 
1799
                else:
 
1800
                    path = c.path[0]
1798
1801
                to_file.write('\t* %s:\n' % (path,))
1799
1802
            for c in revision.delta.renamed:
1800
1803
                oldpath, newpath = c[:2]
1801
1804
                # For renamed files, show both the old and the new path
1802
 
                to_file.write('\t* %s:\n\t* %s:\n' % (oldpath, newpath))
 
1805
                to_file.write('\t* %s:\n\t* %s:\n' % (c.path[0], c.path[1]))
1803
1806
            to_file.write('\n')
1804
1807
 
1805
1808
        if not revision.rev.message: