git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, rybak.a.v@gmail.com,
	Stefan Beller <sbeller@google.com>
Subject: [PATCHv6 00/10] Reroll of sb/diff-color-move-more
Date: Wed, 18 Jul 2018 12:31:46 -0700	[thread overview]
Message-ID: <20180718193156.47365-1-sbeller@google.com> (raw)

v6:
* fixed issues hinted at by Andrei, thanks! (range-diff below)
* incorporates the new config option, sent separately previously.

v5:
This is a resend of sb/diff-color-move-more
https://public-inbox.org/git/20180629001958.85143-1-sbeller@google.com/
that fixes an errornous squashing within the series; the end result is
the same. range diff is below. (As the latest cooking email said
this series is going to land in next soon, I hope this is not too late
of a resend; otherwise just ignore it as the end result is the same)

Thanks,
Stefan


Stefan Beller (10):
  xdiff/xdiff.h: remove unused flags
  xdiff/xdiffi.c: remove unneeded function declarations
  t4015: avoid git as a pipe input
  diff.c: do not pass diff options as keydata to hashmap
  diff.c: adjust hash function signature to match hashmap expectation
  diff.c: add a blocks mode for moved code detection
  diff.c: decouple white space treatment from move detection algorithm
  diff.c: factor advance_or_nullify out of mark_color_as_moved
  diff.c: add white space mode to move detection that allows indent
    changes
  diff.c: offer config option to control ws handling in move detection

 Documentation/config.txt       |   5 +
 Documentation/diff-options.txt |  33 ++++-
 diff.c                         | 262 +++++++++++++++++++++++++++++----
 diff.h                         |   9 +-
 t/t4015-diff-whitespace.sh     | 243 +++++++++++++++++++++++++-----
 xdiff/xdiff.h                  |   8 -
 xdiff/xdiffi.c                 |  17 ---
 7 files changed, 489 insertions(+), 88 deletions(-)


1:  a512cd40cae ! 1:  aabbc4e8aff diff.c: add white space mode to move detection that allows indent changes
    @@ -27,8 +27,8 @@
         modes in the move detection.
     
         This patch brings some challenges, related to the detection of blocks.
    -    We need a white net the catch the possible moved lines, but then need to
    -    narrow down to check if the blocks are still in tact. Consider this
    +    We need a wide net to catch the possible moved lines, but then need to
    +    narrow down to check if the blocks are still intact. Consider this
         example (ignoring block sizes):
     
          - A
    @@ -254,7 +254,7 @@
     +		}
     +	}
     +
    -+	for (i = 0; i <pmb_nr; i++) {
    ++	for (i = 0; i < pmb_nr; i++) {
     +		if (got_match[i]) {
     +			/* Carry the white space delta forward */
     +			pmb[i]->next_line->wsd = pmb[i]->wsd;
-:  ----------- > 2:  f80fbe78d9b diff.c: offer config option to control ws handling in move detection

             reply	other threads:[~2018-07-18 19:32 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-18 19:31 Stefan Beller [this message]
2018-07-18 19:31 ` [PATCH 01/10] xdiff/xdiff.h: remove unused flags Stefan Beller
2018-07-18 19:31 ` [PATCH 02/10] xdiff/xdiffi.c: remove unneeded function declarations Stefan Beller
2018-07-18 19:31 ` [PATCH 03/10] t4015: avoid git as a pipe input Stefan Beller
2018-07-18 19:31 ` [PATCH 04/10] diff.c: do not pass diff options as keydata to hashmap Stefan Beller
2018-07-18 19:31 ` [PATCH 05/10] diff.c: adjust hash function signature to match hashmap expectation Stefan Beller
2018-07-18 19:31 ` [PATCH 06/10] diff.c: add a blocks mode for moved code detection Stefan Beller
2018-07-18 19:31 ` [PATCH 07/10] diff.c: decouple white space treatment from move detection algorithm Stefan Beller
2018-07-18 19:31 ` [PATCH 08/10] diff.c: factor advance_or_nullify out of mark_color_as_moved Stefan Beller
2018-07-18 19:31 ` [PATCH 09/10] diff.c: add white space mode to move detection that allows indent changes Stefan Beller
2018-07-18 19:31 ` [PATCH 10/10] diff.c: offer config option to control ws handling in move detection Stefan Beller
2018-07-19 19:05 ` [PATCHv6 00/10] Reroll of sb/diff-color-move-more 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=20180718193156.47365-1-sbeller@google.com \
    --to=sbeller@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=rybak.a.v@gmail.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.
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).