/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: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
864
864
    if match is None:
865
865
        return log_rev_iterator
866
866
    searchRE = [(k, [re.compile(x, re.IGNORECASE) for x in v])
867
 
                for (k,v) in match.iteritems()]
 
867
                for k, v in match.items()]
868
868
    return _filter_re(searchRE, log_rev_iterator)
869
869
 
870
870
 
881
881
               'author': (rev.get_apparent_authors()),
882
882
               'bugs': list(rev.iter_bugs())
883
883
               }
884
 
    strings[''] = [item for inner_list in strings.itervalues()
 
884
    strings[''] = [item for inner_list in strings.values()
885
885
                   for item in inner_list]
886
886
    for (k,v) in searchRE:
887
887
        if k in strings and not _match_any_filter(strings[k], v):