/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/plugins/grep/grep.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/plugins/grep/grep.py
152
152
                self.get_writer = self._get_writer_fixed_highlighted
153
153
            else:
154
154
                flags = opts.patternc.flags
155
 
                self._sub = re.compile(pat.join(("((?:",")+)")), flags).sub
 
155
                self._sub = re.compile(pat.join(("((?:", ")+)")), flags).sub
156
156
                self._highlight = color_string("\\1", FG.BOLD_RED)
157
157
                self.get_writer = self._get_writer_regexp_highlighted
158
158
        else:
403
403
    # setup relpath to open files relative to cwd
404
404
    rpath = relpath
405
405
    if relpath:
406
 
        rpath = osutils.pathjoin('..',relpath)
 
406
        rpath = osutils.pathjoin('..', relpath)
407
407
 
408
408
    from_dir = osutils.pathjoin(relpath, path)
409
409
    if opts.from_root:
548
548
                self.get_writer = self._get_writer_fixed_highlighted
549
549
            else:
550
550
                flags = opts.patternc.flags
551
 
                self._sub = re.compile(pat.join(("((?:",")+)")), flags).sub
 
551
                self._sub = re.compile(pat.join(("((?:", ")+)")), flags).sub
552
552
                self._highlight = color_string("\\1", FG.BOLD_RED)
553
553
                self.get_writer = self._get_writer_regexp_highlighted
554
554
            path_start = FG.MAGENTA