git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/6] grep: move context hunk mark handling into show_line()

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 1, 2009, 22:55 UTC
Message-ID
<7vzlbodne0.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4A4BDCFE.3050808@lsrfire.ath.cx>
René Scharfe <rene.scharfe@lsrfire.ath.cx> writes:
> Move last_shown into struct grep_opt, to make it available in
> show_line(), and then make the function handle the printing of hunk
> marks for context lines in a central place.

Makes sense. But now "are we showing from a separate block of text" check is in show_line() and relieves the caller of show_line() from doing so,...

Show 9 quoted lines
>  		else if (last_hit &&
>  			 lno <= last_hit + opt->post_context) {
>  			/* If the last hit is within the post context,
>  			 * we need to show this line.
>  			 */
> -			if (last_shown && lno != last_shown + 1)
> -				fputs(hunk_mark, stdout);
>  			show_line(opt, bol, eol, name, lno, '-');
> -			last_shown = lno;
... the comment in this context should go, no?
Previous: René ScharfeNext: René Scharfe
Message 4 of 15 in “grep: add option -p/--show-function, similar to diff's”
  1. 0/6 grep: add option -p/--show-function, similar to diff'sRené Scharfe, Jul 1, 2009
  2. 1/6 userdiff: add xdiff_clear_find_func()René Scharfe, Jul 1, 2009
  3. 2/6 grep: move context hunk mark handling into show_line()René Scharfe, Jul 1, 2009
  4. Junio C HamanoJul 1, 2009
  5. René ScharfeJul 2, 2009
  6. Junio C HamanoJul 2, 2009
  7. 3/6 grep: print context hunk marks between filesRené Scharfe, Jul 1, 2009
  8. 4/6 grep: handle pre context lines on demandRené Scharfe, Jul 1, 2009
  9. 5/6 grep: add option -p/--show-functionRené Scharfe, Jul 1, 2009
  10. Junio C HamanoJul 2, 2009
  11. René ScharfeJul 2, 2009
  12. Junio C HamanoJul 2, 2009
  13. René ScharfeJul 2, 2009
  14. René ScharfeJul 2, 2009
  15. 6/6 grep -p: support user defined regular expressionsRené Scharfe, Jul 1, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.