git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/6] grep: add option -p/--show-function, similar to diff's
Date: Thu, 02 Jul 2009 00:00:05 +0200	[thread overview]
Message-ID: <4A4BDC65.80504@lsrfire.ath.cx> (raw)

This patch series retrofits git grep with functionality similar to the diff
option -p, which shows the function definitions for diff hunks.  git grep is
enhanced to show them as context lines before matches, if called with -p.  It
can be combined with the existing context options (-A, -B, -C).

The first patch is a cleanup.  The userdiff API is enhanced to allow freeing
of allocated memory, before it is used outside of git diff code, later in the
series:

  [PATCH 1/6] userdiff: add xdiff_clear_find_func()

The next three patches massage the context handling code to make it easier to
extend:

  [PATCH 2/6] grep: move context hunk mark handling into show_line()
  [PATCH 3/6] grep: print context hunk marks between files
  [PATCH 4/6] grep: handle pre context lines on demand

Finally, handling for the option -p is added and then enhanced to support
userdiff configuration settings:

  [PATCH 5/6] grep: add option -p/--show-function
  [PATCH 6/6] grep -p: support user defined regular expressions


 Documentation/git-grep.txt |    8 ++
 builtin-grep.c             |   22 ++++++-
 diff.c                     |    1 +
 grep.c                     |  154 ++++++++++++++++++++++++++++++++------------
 grep.h                     |    4 +
 t/t7002-grep.sh            |   71 ++++++++++++++++++++-
 xdiff-interface.c          |   15 ++++
 xdiff-interface.h          |    1 +
 8 files changed, 232 insertions(+), 44 deletions(-)

             reply	other threads:[~2009-07-01 22:00 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-01 22:00 René Scharfe [this message]
2009-07-01 22:01 ` [PATCH 1/6] userdiff: add xdiff_clear_find_func() René Scharfe
2009-07-01 22:02 ` [PATCH 2/6] grep: move context hunk mark handling into show_line() René Scharfe
2009-07-01 22:55   ` Junio C Hamano
2009-07-02  3:15     ` René Scharfe
2009-07-02  5:24       ` Junio C Hamano
2009-07-01 22:03 ` [PATCH 3/6] grep: print context hunk marks between files René Scharfe
2009-07-01 22:05 ` [PATCH 4/6] grep: handle pre context lines on demand René Scharfe
2009-07-01 22:06 ` [PATCH 5/6] grep: add option -p/--show-function René Scharfe
2009-07-02  2:35   ` Junio C Hamano
2009-07-02  4:38     ` René Scharfe
2009-07-02  5:27       ` Junio C Hamano
2009-07-02  6:16         ` René Scharfe
2009-07-02 15:42           ` René Scharfe
2009-07-01 22:07 ` [PATCH 6/6] grep -p: support user defined regular expressions René Scharfe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A4BDC65.80504@lsrfire.ath.cx \
    --to=rene.scharfe@lsrfire.ath.cx \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).