From: Junio C Hamano <gitster@pobox•com>
To: Stefan Beller <sbeller@google•com>
Cc: "Jonathan Nieder" <jrnieder@gmail•com>,
"Lars Schneider" <larsxschneider@gmail•com>,
git <git@vger•kernel.org>, "Torsten Bögershausen" <tboegi@web•de>,
"Jeff King" <peff@peff•net>,
"Johannes Schindelin" <johannes.schindelin@gmx•de>
Subject: Re* Consequences of CRLF in index?
Date: Fri, 27 Oct 2017 15:13:53 +0900 [thread overview]
Message-ID: <xmqqinf1ce3i.fsf_-_@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqy3nye9n8.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Thu, 26 Oct 2017 14:54:51 +0900")
Junio C Hamano <gitster@pobox•com> writes:
> Stefan Beller <sbeller@google•com> writes:
>
>> (1<<5) is taken twice now.
>
> Good eyes. I think we use bits #1-#8 now (bit #0 is vacant, so are
> #9-#31).
Let's do this bit-shuffling as a preliminary clean-up.
-- >8 --
Subject: [PATCH] xdiff: reassign xpparm_t.flags bits
We have packed the bits too tightly in such a way that it is not
easy to add a new type of whitespace ignoring option, a new type
of LCS algorithm, or a new type of post-cleanup heuristics.
Reorder bits a bit to give room for these three classes of options
to grow.
While at it, add a comment in front of the bit definitions to
clarify in which structure these defined bits may appear.
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
xdiff/xdiff.h | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index b090ad8eac..457cac32d8 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -27,22 +27,24 @@
extern "C" {
#endif /* #ifdef __cplusplus */
+/* xpparm_t.flags */
+#define XDF_NEED_MINIMAL (1 << 0)
-#define XDF_NEED_MINIMAL (1 << 1)
#define XDF_IGNORE_WHITESPACE (1 << 2)
#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4)
#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
-#define XDF_PATIENCE_DIFF (1 << 5)
-#define XDF_HISTOGRAM_DIFF (1 << 6)
+#define XDF_IGNORE_BLANK_LINES (1 << 7)
+
+#define XDF_PATIENCE_DIFF (1 << 14)
+#define XDF_HISTOGRAM_DIFF (1 << 15)
#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
#define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
-#define XDF_IGNORE_BLANK_LINES (1 << 7)
-
-#define XDF_INDENT_HEURISTIC (1 << 8)
+#define XDF_INDENT_HEURISTIC (1 << 23)
+/* xdemitconf_t.flags */
#define XDL_EMIT_FUNCNAMES (1 << 0)
#define XDL_EMIT_FUNCCONTEXT (1 << 2)
--
2.15.0-rc2-266-g8f92d095f4
next prev parent reply other threads:[~2017-10-27 6:13 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-24 17:48 Consequences of CRLF in index? Lars Schneider
2017-10-24 18:14 ` Jonathan Nieder
2017-10-24 19:02 ` Torsten Bögershausen
2017-10-25 12:13 ` Johannes Schindelin
2017-10-25 1:51 ` Junio C Hamano
2017-10-25 4:53 ` Junio C Hamano
2017-10-25 16:44 ` Stefan Beller
2017-10-26 5:54 ` Junio C Hamano
2017-10-27 6:13 ` Junio C Hamano [this message]
2017-10-27 17:06 ` Re* " Stefan Beller
2017-10-27 17:07 ` [PATCH 0/2] " Stefan Beller
2017-10-27 17:07 ` [PATCH 1/2] xdiff/xdiff.h: remove unused flags Stefan Beller
2017-10-27 17:07 ` [PATCH 2/2] xdiff/xdiffi.c: remove unneeded function declarations Stefan Beller
2017-10-30 17:20 ` [PATCH 0/2] Re* Consequences of CRLF in index? Stefan Beller
2017-10-31 2:44 ` Junio C Hamano
2017-10-31 16:41 ` Stefan Beller
2017-10-31 17:01 ` Jeff King
2017-11-07 6:40 ` [PATCH v2 0/2] Teach "diff" to ignore only CR at EOL Junio C Hamano
2017-11-07 6:40 ` [PATCH v2 1/2] xdiff: reassign xpparm_t.flags bits Junio C Hamano
2017-11-07 12:44 ` Johannes Schindelin
2017-11-07 15:02 ` Junio C Hamano
2017-11-07 6:40 ` [PATCH v2 2/2] diff: --ignore-cr-at-eol Junio C Hamano
2017-11-07 13:23 ` Johannes Schindelin
2017-11-08 0:43 ` Junio C Hamano
2017-11-08 0:49 ` Junio C Hamano
2017-11-15 4:28 ` Junio C Hamano
2017-11-07 12:30 ` [PATCH v2 0/2] Teach "diff" to ignore only CR at EOL Johannes Schindelin
2017-11-07 15:12 ` Junio C Hamano
2017-11-07 17:42 ` Stefan Beller
2017-10-25 17:04 ` Consequences of CRLF in index? Lars Schneider
2017-10-25 17:13 ` Jonathan Nieder
2017-10-26 11:06 ` Lars Schneider
2017-10-26 19:15 ` Torsten Bögershausen
2017-10-24 21:04 ` Johannes Sixt
2017-10-25 12:19 ` Johannes Schindelin
2017-10-26 7:09 ` Johannes Sixt
2017-10-26 11:01 ` Lars Schneider
2017-10-26 19:22 ` Torsten Bögershausen
2017-10-26 20:20 ` Johannes Sixt
2017-10-26 20:30 ` Jonathan Nieder
2017-10-26 20:51 ` Johannes Sixt
2017-10-26 22:27 ` Ross Kabus
2017-10-27 1:05 ` Junio C Hamano
2017-10-27 15:18 ` Johannes Schindelin
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=xmqqinf1ce3i.fsf_-_@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=jrnieder@gmail$(echo .)com \
--cc=larsxschneider@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sbeller@google$(echo .)com \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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