/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/plugins/grep/grep.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
653
653
 
654
654
    if opts.files_with_matches or opts.files_without_match:
655
655
        if opts.fixed_string:
656
 
            if sys.platform > (2, 5):
657
 
                found = pattern in file_text
658
 
            else:
659
 
                for line in file_text.splitlines():
660
 
                    if pattern in line:
661
 
                        found = True
662
 
                        break
663
 
                else:
664
 
                    found = False
 
656
            found = pattern in file_text
665
657
        else:
666
658
            search = opts.patternc.search
667
659
            if "$" not in pattern: