From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH 0/7] improve range-diffs coloring and [RFC] move detection
Date: Fri, 3 Aug 2018 18:53:10 -0700 [thread overview]
Message-ID: <20180804015317.182683-1-sbeller@google.com> (raw)
This builds on top of sb/range-diff-colors, which builds on js/range-diff.
As Thomas seemed happy with the range-diff and said
"and fwiw I didn't think there's anything major that needs to be addressed."
I found it reasonable to build more on top of those series.
[1] https://public-inbox.org/git/20180729215053.GE9955@hank.intra.tgummerer.com/
It can also be found via
git fetch https://github.com/stefanbeller/git moved-in-patches
This series provides for 2 goals, which share a common base refactoring:
The refactoring part is to allow the diff machinery to prefix
old/new/context lines with prefixes as chosen by the user.
The first feature is to slightly adapt coloring of range-diff to have the
file markers
--- a/diff.c
+++ b/diff.c
be shown as context color. This is done by using custom prefixes for
old/new/context lines in the inner diffs and indenting all other lines
instead by a white space indicating it to be context.
The second feature is more RFC-ish in nature and just exposes the
mechanism to the user in a meaning-ful way.
All of the diff family (including format-patch) as well as apply/am
can use */~ instead of +/- for moved lines of code.
Thanks,
Stefan
Stefan Beller (7):
diff.c: emit_line_0 to take string instead of first sign
diff.c: add --output-indicator-{new, old, context}
range-diff: make use of different output indicators
range-diff: indent special lines as context
diff.c: rename color_moved to markup_moved
diff.c: factor determine_line_color out of
emit_diff_symbol_from_struct
diff/am: enhance diff format to use */~ for moved lines
apply.c | 12 +++
diff.c | 180 ++++++++++++++++++++++++++----------------
diff.h | 10 ++-
range-diff.c | 17 +++-
t/t3206-range-diff.sh | 12 +--
5 files changed, 153 insertions(+), 78 deletions(-)
--
2.18.0.597.ga71716f1ad-goog
next reply other threads:[~2018-08-04 1:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-04 1:53 Stefan Beller [this message]
2018-08-04 1:53 ` [PATCH 1/7] diff.c: emit_line_0 to take string instead of first sign Stefan Beller
2018-08-04 1:53 ` [PATCH 2/7] diff.c: add --output-indicator-{new, old, context} Stefan Beller
2018-08-04 1:53 ` [PATCH 3/7] range-diff: make use of different output indicators Stefan Beller
2018-08-04 1:53 ` [PATCH 4/7] range-diff: indent special lines as context Stefan Beller
2018-08-04 1:53 ` [PATCH 5/7] diff.c: rename color_moved to markup_moved Stefan Beller
2018-08-04 1:53 ` [PATCH 6/7] diff.c: factor determine_line_color out of emit_diff_symbol_from_struct Stefan Beller
2018-08-04 1:53 ` [RFC PATCH 7/7] diff/am: enhance diff format to use */~ for moved lines Stefan Beller
2018-08-04 17:15 ` Junio C Hamano
2018-08-06 6:07 ` Stefan Beller
2018-08-04 16:57 ` [PATCH 0/7] improve range-diffs coloring and [RFC] move detection Junio C Hamano
2018-08-06 6:01 ` Stefan Beller
2018-08-06 20:18 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180804015317.182683-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).