Show More
@@ -3364,10 +3364,7 b' def grep(ui, repo, pattern, *pats, **opt' | |||||
3364 | cols.append((ui.shortuser(ctx.user()), 'grep.user')) |
|
3364 | cols.append((ui.shortuser(ctx.user()), 'grep.user')) | |
3365 | if opts.get('date'): |
|
3365 | if opts.get('date'): | |
3366 | cols.append((datefunc(ctx.date()), 'grep.date')) |
|
3366 | cols.append((datefunc(ctx.date()), 'grep.date')) | |
3367 | if opts.get('files_with_matches'): |
|
3367 | if not opts.get('files_with_matches'): | |
3368 | if found: |
|
|||
3369 | continue |
|
|||
3370 | else: |
|
|||
3371 | before = l.line[:l.colstart] |
|
3368 | before = l.line[:l.colstart] | |
3372 | match = l.line[l.colstart:l.colend] |
|
3369 | match = l.line[l.colstart:l.colend] | |
3373 | after = l.line[l.colend:] |
|
3370 | after = l.line[l.colend:] | |
@@ -3385,6 +3382,8 b' def grep(ui, repo, pattern, *pats, **opt' | |||||
3385 | ui.write(after) |
|
3382 | ui.write(after) | |
3386 | ui.write(eol) |
|
3383 | ui.write(eol) | |
3387 | found = True |
|
3384 | found = True | |
|
3385 | if before is None: | |||
|
3386 | break | |||
3388 | return found |
|
3387 | return found | |
3389 |
|
3388 | |||
3390 | skip = {} |
|
3389 | skip = {} |
General Comments 0
You need to be logged in to leave comments.
Login now