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

  • Committer: Martin
  • Date: 2017-11-12 13:53:51 UTC
  • mto: This revision was merged to the branch mainline in revision 6810.
  • Revision ID: gzlist@googlemail.com-20171112135351-uyr1ncw7visg62c2
Apply 2to3 ws_comma fixer

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/annotate.py
199
199
    for origin, text in annotations:
200
200
        text = text.rstrip('\r\n')
201
201
        if origin == last_origin:
202
 
            (revno_str, author, date_str) = ('','','')
 
202
            (revno_str, author, date_str) = ('', '', '')
203
203
        else:
204
204
            last_origin = origin
205
205
            if origin not in revisions:
206
 
                (revno_str, author, date_str) = ('?','?','?')
 
206
                (revno_str, author, date_str) = ('?', '?', '?')
207
207
            else:
208
208
                revno_str = '.'.join(str(i) for i in
209
209
                                            revision_id_to_revno[origin])
343
343
    output_extend = output_lines.extend
344
344
    output_append = output_lines.append
345
345
    # We need to see if any of the unannotated lines match
346
 
    plain_right_subset = [l for a,l in right_lines[start_right:end_right]]
 
346
    plain_right_subset = [l for a, l in right_lines[start_right:end_right]]
347
347
    plain_child_subset = plain_child_lines[start_child:end_child]
348
348
    match_blocks = _get_matching_blocks(plain_right_subset, plain_child_subset)
349
349