From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [RFC/PATCH 0/2] Color moved code differently
Date: Fri, 2 Sep 2016 20:31:18 -0700 [thread overview]
Message-ID: <20160903033120.20511-1-sbeller@google.com> (raw)
When moving code (e.g. a function is moved to another part of the file or
to a different file), the review process is different than reviewing new
code. When reviewing moved code we are only interested in the diff as
where there are differences in the moved code, e.g. namespace changes.
However the inner part of these moved texts should not change.
To aid a developer reviewing such code, we'll color pure moved stuff
differently.
A line is colored differently if that line and the surroundign 2 lines
appear as-is in the opposite part of the diff.
Example:
http://i.imgur.com/ay84q0q.png
Or apply these patches and
git show e28eae3184b26d3cf3293e69403babb5c575342c
git show bc9204d4ef6e0672389fdfb0d398fa9a39dba3d5
git show 8465541e8ce8eaf16e66ab847086779768c18f2d
The code quality sucks though, hence RFC.
Thanks,
Stefan
Stefan Beller (2):
diff.c: emit duplicate lines with a different color
WIP xdiff: markup duplicates differently
diff.c | 26 ++++++++++++
diff.h | 4 +-
xdiff/xdiff.h | 1 +
xdiff/xemit.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
4 files changed, 156 insertions(+), 3 deletions(-)
--
2.10.0.rc2.23.gf336a1a.dirty
next reply other threads:[~2016-09-03 3:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-03 3:31 Stefan Beller [this message]
2016-09-03 3:31 ` [PATCH 1/2] diff.c: emit duplicate lines with a different color Stefan Beller
2016-09-03 3:31 ` [RFC/PATCH 2/2] WIP xdiff: markup duplicates differently Stefan Beller
2016-09-03 12:25 ` Jakub Narębski
2016-09-04 5:31 ` Stefan Beller
2016-09-04 10:35 ` Jakub Narębski
2016-09-04 6:48 ` Junio C Hamano
2016-09-03 7:00 ` [RFC/PATCH 0/2] Color moved code differently Junio C Hamano
2016-09-04 5:23 ` Stefan Beller
2016-09-04 6:41 ` Junio C Hamano
2016-09-04 8:28 ` Stefan Beller
2016-09-04 22:19 ` Junio C Hamano
2016-09-04 9:57 ` Jacob Keller
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=20160903033120.20511-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).