From: Phillip Wood <phillip.wood123@gmail•com>
To: Ezekiel Newren via GitGitGadget <gitgitgadget@gmail•com>,
git@vger•kernel.org
Cc: Elijah Newren <newren@gmail•com>,
Ben Knoble <ben.knoble@gmail•com>, Jeff King <peff@peff•net>,
Ezekiel Newren <ezekielnewren@gmail•com>
Subject: Re: [PATCH v6 00/12] Cleanup xdfile_t and xrecord_t in xdiff.
Date: Fri, 3 Oct 2025 14:47:49 +0100 [thread overview]
Message-ID: <01959215-3cb5-4c12-91eb-1b28e18addf9@gmail.com> (raw)
In-Reply-To: <pull.2048.v6.git.git.1758926520.gitgitgadget@gmail.com>
Hi Ezekiel
On 26/09/2025 23:41, Ezekiel Newren via GitGitGadget wrote:
> Changes since v5.
>
> * Address review feedback on commit messages.
> * Drop commit "xdiff: delete rchg aliasing"
> * Use DISCARD/KEEP/INVESTIGATE instead of NONE/SOME/TOO_MANY
> * Fix the word wrapping in the comments of xprepare.c
Thanks for expanding the commit messages, I think the range diff looks
good. There's a typo in patch 12 (see below) but its not worth
re-rolling just for that.
> Range-diff vs v5:
> [...]
> 12: 08a0fceb72 ! 11: f08782a977 xdiff: use enum macros NONE(0), SOME(1), TOO_MANY(2) in xprepare.c
> @@ Metadata
> Author: Ezekiel Newren <ezekielnewren@gmail•com>
>
> ## Commit message ##
> - xdiff: use enum macros NONE(0), SOME(1), TOO_MANY(2) in xprepare.c
> + xdiff: add macros DISCARD(0), KEEP(1), INVESTIGATE(2) in xprepare.c
>
> - Rename dis1, dis2 to matches1, matches2.
> + This commit is refactor-only; no behavior is changed. A future commit
> + will use bool literals for changed[i].
>
> - Define macros NONE(0), SOME(1), TOO_MANY(2) as the enum values for
> - matches1 and matches2. These states will influence whether changed[i]
> - is set to 1 or kept as 0.
> + The functions xdl_clean_mmatch() and xdl_cleanup_records() will be
> + cleaned up more in a future patch series. The changes to
> + xdl_cleanup_records(), in this patch, is just to make it clear why
Not worth a re-roll on its own s/is/are/
Thanks for working on this
Phillip
> + `char rchg` is refactored to `bool changed`.
> +
> + Rename dis* to action* and replace literal numericals with macros.
> + The old names came from when dis* (which I think was short for discard)
> + was treated like a boolean, but over time it grew into a ternary state
> + machine. The result was confusing because dis* and rchg* both used 0/1
> + values with different meanings.
> +
> + The new names and macros make the states explicit. nm is short for
> + number of matches, and mlim is a heuristic limit:
> +
> + nm == 0 -> action[i] = DISCARD -> changed[i] = true
> + 0 < nm < mlim -> action[i] = KEEP -> changed[i] = false
> + nm >= mlim -> action[i] = INVESTIGATE -> changed[i] = xdl_clean_mmatch()
> +
> + When need_min is true, only DISCARD and KEEP occur because the limit
> + is effectively infinite.
>
> Best-viewed-with: --color-words
> Signed-off-by: Ezekiel Newren <ezekielnewren@gmail•com>
> @@ xdiff/xprepare.c
> #define XDL_GUESS_NLINES1 256
> #define XDL_GUESS_NLINES2 20
>
> -+#define NONE 0
> -+#define SOME 1
> -+#define TOO_MANY 2
> ++#define DISCARD 0
> ++#define KEEP 1
> ++#define INVESTIGATE 2
>
> typedef struct s_xdlclass {
> struct s_xdlclass *next;
> @@ xdiff/xprepare.c: void xdl_free_env(xdfenv_t *xe) {
>
>
> -static int xdl_clean_mmatch(char const *dis, long i, long s, long e) {
> -+static bool xdl_clean_mmatch(uint8_t const *matches, long i, long s, long e) {
> ++static bool xdl_clean_mmatch(uint8_t const *action, long i, long s, long e) {
> long r, rdis0, rpdis0, rdis1, rpdis1;
>
> /*
> - * Limits the window the is examined during the similar-lines
> - * scan. The loops below stops when dis[i - r] == 1 (line that
> +- * has no match), but there are corner cases where the loop
> +- * proceed all the way to the extremities by causing huge
> +- * performance penalties in case of big files.
> + * Limits the window that is examined during the similar-lines
> -+ * scan. The loops below stops when matches[i - r] == SOME (line that
> - * has no match), but there are corner cases where the loop
> - * proceed all the way to the extremities by causing huge
> - * performance penalties in case of big files.
> ++ * scan. The loops below stops when action[i - r] == KEEP
> ++ * (line that has no match), but there are corner cases where
> ++ * the loop proceed all the way to the extremities by causing
> ++ * huge performance penalties in case of big files.
> + */
> + if (i - s > XDL_SIMSCAN_WINDOW)
> + s = i - XDL_SIMSCAN_WINDOW;
> @@ xdiff/xprepare.c: static int xdl_clean_mmatch(char const *dis, long i, long s, long e) {
>
> /*
> * Scans the lines before 'i' to find a run of lines that either
> - * have no match (dis[j] == 0) or have multiple matches (dis[j] > 1).
> - * Note that we always call this function with dis[i] > 1, so the
> -+ * have no match (matches[j] == NONE) or have multiple matches (matches[j] == TOO_MANY).
> -+ * Note that we always call this function with matches[i] == TOO_MANY, so the
> - * current line (i) is already a multimatch line.
> +- * current line (i) is already a multimatch line.
> ++ * have no match (action[j] == DISCARD) or have multiple matches
> ++ * (action[j] == INVESTIGATE). Note that we always call this
> ++ * function with action[i] == INVESTIGATE, so the current line
> ++ * (i) is already a multimatch line.
> */
> for (r = 1, rdis0 = 0, rpdis0 = 1; (i - r) >= s; r++) {
> - if (!dis[i - r])
> -+ if (matches[i - r] == NONE)
> ++ if (action[i - r] == DISCARD)
> rdis0++;
> - else if (dis[i - r] == 2)
> -+ else if (matches[i - r] == TOO_MANY)
> ++ else if (action[i - r] == INVESTIGATE)
> rpdis0++;
> - else
> -+ else if (matches[i - r] == SOME)
> ++ else if (action[i - r] == KEEP)
> break;
> + else
> -+ BUG("Illegal value for matches[i - r]");
> ++ BUG("Illegal value for action[i - r]");
> }
> /*
> - * If the run before the line 'i' found only multimatch lines, we
> +- * If the run before the line 'i' found only multimatch lines, we
> - * return 0 and hence we don't make the current line (i) discarded.
> -+ * return false and hence we don't make the current line (i) discarded.
> - * We want to discard multimatch lines only when they appear in the
> +- * We want to discard multimatch lines only when they appear in the
> - * middle of runs with nomatch lines (dis[j] == 0).
> -+ * middle of runs with nomatch lines (matches[j] == NONE).
> ++ * If the run before the line 'i' found only multimatch lines,
> ++ * we return false and hence we don't make the current line (i)
> ++ * discarded. We want to discard multimatch lines only when
> ++ * they appear in the middle of runs with nomatch lines
> ++ * (action[j] == DISCARD).
> */
> if (rdis0 == 0)
> return 0;
> for (r = 1, rdis1 = 0, rpdis1 = 1; (i + r) <= e; r++) {
> - if (!dis[i + r])
> -+ if (matches[i + r] == NONE)
> ++ if (action[i + r] == DISCARD)
> rdis1++;
> - else if (dis[i + r] == 2)
> -+ else if (matches[i + r] == TOO_MANY)
> ++ else if (action[i + r] == INVESTIGATE)
> rpdis1++;
> - else
> -+ else if (matches[i + r] == SOME)
> ++ else if (action[i + r] == KEEP)
> break;
> + else
> -+ BUG("Illegal value for matches[i + r]");
> ++ BUG("Illegal value for action[i + r]");
> }
> /*
> - * If the run after the line 'i' found only multimatch lines, we
> +- * If the run after the line 'i' found only multimatch lines, we
> - * return 0 and hence we don't make the current line (i) discarded.
> -+ * return false and hence we don't make the current line (i) discarded.
> ++ * If the run after the line 'i' found only multimatch lines,
> ++ * we return false and hence we don't make the current line (i)
> ++ * discarded.
> */
> if (rdis1 == 0)
> - return 0;
> @@ xdiff/xprepare.c: static int xdl_clean_mmatch(char const *dis, long i, long s, l
> xdlclass_t *rcrec;
> - char *dis, *dis1, *dis2;
> - int need_min = !!(cf->flags & XDF_NEED_MINIMAL);
> -+ uint8_t *matches1, *matches2;
> -+ int status = 0;
> ++ uint8_t *action1 = NULL, *action2 = NULL;
> + bool need_min = !!(cf->flags & XDF_NEED_MINIMAL);
> ++ int ret = 0;
>
> - if (!XDL_CALLOC_ARRAY(dis, xdf1->nrec + xdf2->nrec + 2))
> - return -1;
> - dis1 = dis;
> - dis2 = dis1 + xdf1->nrec + 1;
> -+ matches1 = NULL;
> -+ matches2 = NULL;
> -+
> + /*
> + * Create temporary arrays that will help us decide if
> + * changed[i] should remain 0 or become 1.
> + */
> -+ if (!XDL_CALLOC_ARRAY(matches1, xdf1->nrec + 1)) {
> -+ status = -1;
> ++ if (!XDL_CALLOC_ARRAY(action1, xdf1->nrec + 1)) {
> ++ ret = -1;
> + goto cleanup;
> + }
> -+ if (!XDL_CALLOC_ARRAY(matches2, xdf2->nrec + 1)) {
> -+ status = -1;
> ++ if (!XDL_CALLOC_ARRAY(action2, xdf2->nrec + 1)) {
> ++ ret = -1;
> + goto cleanup;
> + }
>
> + /*
> -+ * Initialize temporary arrays with NONE, SOME, or TOO_MANY.
> ++ * Initialize temporary arrays with DISCARD, KEEP, or INVESTIGATE.
> + */
> if ((mlim = xdl_bogosqrt(xdf1->nrec)) > XDL_MAX_EQLIMIT)
> mlim = XDL_MAX_EQLIMIT;
> @@ xdiff/xprepare.c: static int xdl_clean_mmatch(char const *dis, long i, long s, l
> rcrec = cf->rcrecs[recs->ha];
> nm = rcrec ? rcrec->len2 : 0;
> - dis1[i] = (nm == 0) ? 0: (nm >= mlim && !need_min) ? 2: 1;
> -+ matches1[i] = (nm == 0) ? NONE: (nm >= mlim && !need_min) ? TOO_MANY: SOME;
> ++ action1[i] = (nm == 0) ? DISCARD: (nm >= mlim && !need_min) ? INVESTIGATE: KEEP;
> }
>
> if ((mlim = xdl_bogosqrt(xdf2->nrec)) > XDL_MAX_EQLIMIT)
> @@ xdiff/xprepare.c: static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *
> rcrec = cf->rcrecs[recs->ha];
> nm = rcrec ? rcrec->len1 : 0;
> - dis2[i] = (nm == 0) ? 0: (nm >= mlim && !need_min) ? 2: 1;
> -+ matches2[i] = (nm == 0) ? NONE: (nm >= mlim && !need_min) ? TOO_MANY: SOME;
> ++ action2[i] = (nm == 0) ? DISCARD: (nm >= mlim && !need_min) ? INVESTIGATE: KEEP;
> }
>
> + /*
> @@ xdiff/xprepare.c: static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *
> i <= xdf1->dend; i++, recs++) {
> - if (dis1[i] == 1 ||
> - (dis1[i] == 2 && !xdl_clean_mmatch(dis1, i, xdf1->dstart, xdf1->dend))) {
> -+ if (matches1[i] == SOME ||
> -+ (matches1[i] == TOO_MANY && !xdl_clean_mmatch(matches1, i, xdf1->dstart, xdf1->dend))) {
> ++ if (action1[i] == KEEP ||
> ++ (action1[i] == INVESTIGATE && !xdl_clean_mmatch(action1, i, xdf1->dstart, xdf1->dend))) {
> xdf1->rindex[nreff++] = i;
> -+ /* changed[i] remains 0 */
> ++ /* changed[i] remains 0, i.e. keep */
> } else
> xdf1->changed[i] = 1;
> ++ /* i.e. discard */
> }
> -@@ xdiff/xprepare.c: static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
> + xdf1->nreff = nreff;
>
> for (nreff = 0, i = xdf2->dstart, recs = &xdf2->recs[xdf2->dstart];
> i <= xdf2->dend; i++, recs++) {
> - if (dis2[i] == 1 ||
> - (dis2[i] == 2 && !xdl_clean_mmatch(dis2, i, xdf2->dstart, xdf2->dend))) {
> -+ if (matches2[i] == SOME ||
> -+ (matches2[i] == TOO_MANY && !xdl_clean_mmatch(matches2, i, xdf2->dstart, xdf2->dend))) {
> ++ if (action2[i] == KEEP ||
> ++ (action2[i] == INVESTIGATE && !xdl_clean_mmatch(action2, i, xdf2->dstart, xdf2->dend))) {
> xdf2->rindex[nreff++] = i;
> -+ /* changed[i] remains 0 */
> ++ /* changed[i] remains 0, i.e. keep */
> } else
> xdf2->changed[i] = 1;
> ++ /* i.e. discard */
> }
> xdf2->nreff = nreff;
>
> - xdl_free(dis);
> +cleanup:
> -+ xdl_free(matches1);
> -+ xdl_free(matches2);
> ++ xdl_free(action1);
> ++ xdl_free(action2);
>
> - return 0;
> -+ return status;
> ++ return ret;
> }
>
>
> 13: 975e845bfa ! 12: 83e1ace5bd xdiff: change type of xdfile_t.changed from char to bool
> @@ Commit message
> xdiff: change type of xdfile_t.changed from char to bool
>
> The only values possible for 'changed' is 1 and 0, which exactly maps
> - to a bool type. It might not look like this is the case because
> - matches1 and matches2 (which use to be dis1, and dis2) were also char
> - and were assigned numerical values within a few lines of 'changed'
> - (what used to be rchg).
> + to a bool type. It might not look like this because action1 and action2
> + (which use to be dis1, and dis2) were also of type char and were
> + assigned numerical values within a few lines of 'changed' (what used to
> + be rchg).
>
> - Using NONE, SOME, TOO_MANY for matches1[i]/matches2[j], and true/false
> + Using DISCARD/KEEP/INVESTIGATE for action1[i]/action2[j], and true/false
> for changed[k] makes it clear to future readers that these are
> logically separate concepts.
>
> @@ xdiff/xdiffi.c: static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g)
>
> while (xdf->changed[g->start - 1])
> g->start--;
> +@@ xdiff/xdiffi.c: int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
> +
> + int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr) {
> + xdchange_t *cscr = NULL, *xch;
> +- char *changed1 = xe->xdf1.changed, *changed2 = xe->xdf2.changed;
> ++ bool *changed1 = xe->xdf1.changed, *changed2 = xe->xdf2.changed;
> + long i1, i2, l1, l2;
> +
> + /*
>
> ## xdiff/xhistogram.c ##
> @@ xdiff/xhistogram.c: redo:
> @@ xdiff/xprepare.c: static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *
> - * changed[i] should remain 0 or become 1.
> + * changed[i] should remain false, or become true.
> */
> - if (!XDL_CALLOC_ARRAY(matches1, xdf1->nrec + 1)) {
> - status = -1;
> + if (!XDL_CALLOC_ARRAY(action1, xdf1->nrec + 1)) {
> + ret = -1;
> @@ xdiff/xprepare.c: static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
>
> /*
> @@ xdiff/xprepare.c: static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *
> */
> for (nreff = 0, i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart];
> i <= xdf1->dend; i++, recs++) {
> - if (matches1[i] == SOME ||
> - (matches1[i] == TOO_MANY && !xdl_clean_mmatch(matches1, i, xdf1->dstart, xdf1->dend))) {
> + if (action1[i] == KEEP ||
> + (action1[i] == INVESTIGATE && !xdl_clean_mmatch(action1, i, xdf1->dstart, xdf1->dend))) {
> xdf1->rindex[nreff++] = i;
> -- /* changed[i] remains 0 */
> -+ /* changed[i] remains false */
> +- /* changed[i] remains 0, i.e. keep */
> ++ /* changed[i] remains false, i.e. keep */
> } else
> - xdf1->changed[i] = 1;
> + xdf1->changed[i] = true;
> + /* i.e. discard */
> }
> xdf1->nreff = nreff;
> -
> @@ xdiff/xprepare.c: static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
> - if (matches2[i] == SOME ||
> - (matches2[i] == TOO_MANY && !xdl_clean_mmatch(matches2, i, xdf2->dstart, xdf2->dend))) {
> + if (action2[i] == KEEP ||
> + (action2[i] == INVESTIGATE && !xdl_clean_mmatch(action2, i, xdf2->dstart, xdf2->dend))) {
> xdf2->rindex[nreff++] = i;
> -- /* changed[i] remains 0 */
> -+ /* changed[i] remains false */
> +- /* changed[i] remains 0, i.e. keep */
> ++ /* changed[i] remains false, i.e. keep */
> } else
> - xdf2->changed[i] = 1;
> + xdf2->changed[i] = true;
> + /* i.e. discard */
> }
> xdf2->nreff = nreff;
> -
>
> ## xdiff/xtypes.h ##
> @@ xdiff/xtypes.h: typedef struct s_xdfile {
>
prev parent reply other threads:[~2025-10-03 13:47 UTC|newest]
Thread overview: 158+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-07 19:45 [PATCH 00/17] Use rust types in xdiff Ezekiel Newren via GitGitGadget
2025-09-07 19:45 ` [PATCH 01/17] xdiff: delete static forward declarations in xprepare Ezekiel Newren via GitGitGadget
2025-09-09 8:55 ` Elijah Newren
2025-09-07 19:45 ` [PATCH 02/17] xdiff: delete local variables and initialize/free xdfile_t directly Ezekiel Newren via GitGitGadget
2025-09-09 8:56 ` Elijah Newren
2025-09-07 19:45 ` [PATCH 03/17] xdiff: delete unnecessary fields from xrecord_t and xdfile_t Ezekiel Newren via GitGitGadget
2025-09-09 8:56 ` Elijah Newren
2025-09-07 19:45 ` [PATCH 04/17] xdiff: delete xdl_get_rec() in xemit Ezekiel Newren via GitGitGadget
2025-09-09 8:56 ` Elijah Newren
2025-09-07 19:45 ` [PATCH 05/17] xdiff: delete struct diffdata_t Ezekiel Newren via GitGitGadget
2025-09-09 8:56 ` Elijah Newren
2025-09-07 19:45 ` [PATCH 06/17] xdiff: delete redundant array xdfile_t.ha Ezekiel Newren via GitGitGadget
2025-09-09 8:57 ` Elijah Newren
2025-09-07 19:45 ` [PATCH 07/17] xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_t Ezekiel Newren via GitGitGadget
2025-09-09 8:57 ` Elijah Newren
2025-09-07 19:45 ` [PATCH 08/17] xdiff: delete chastore from xdfile_t, view with --color-words Ezekiel Newren via GitGitGadget
2025-09-09 8:58 ` Elijah Newren
2025-09-09 13:50 ` Phillip Wood
2025-09-09 20:33 ` Junio C Hamano
2025-09-10 22:02 ` Ben Knoble
2025-09-07 19:45 ` [PATCH 09/17] xdiff: treat xdfile_t.rchg like an enum Ezekiel Newren via GitGitGadget
2025-09-09 8:58 ` Elijah Newren
2025-09-07 19:45 ` [PATCH 10/17] compat/rust_types.h: define rust primitive types Ezekiel Newren via GitGitGadget
2025-09-08 15:08 ` Junio C Hamano
2025-09-08 16:15 ` Ezekiel Newren
2025-09-07 19:45 ` [PATCH 11/17] xdiff: include compat/rust_types.h Ezekiel Newren via GitGitGadget
2025-09-07 19:45 ` [PATCH 12/17] xdiff: make xrecord_t.ptr a u8 instead of char Ezekiel Newren via GitGitGadget
2025-09-07 19:45 ` [PATCH 13/17] xdiff: make xrecord_t.size a usize instead of long Ezekiel Newren via GitGitGadget
2025-09-07 19:45 ` [PATCH 14/17] xdiff: split xrecord_t.ha into line_hash and minimal_perfect_hash Ezekiel Newren via GitGitGadget
2025-09-07 19:45 ` [PATCH 15/17] xdiff: make xdfile_t.nrec a usize instead of long Ezekiel Newren via GitGitGadget
2025-09-07 19:45 ` [PATCH 16/17] xdiff: make xdfile_t.nreff " Ezekiel Newren via GitGitGadget
2025-09-07 19:45 ` [PATCH 17/17] xdiff: change the types of dstart, dend, rchg, and rindex in xdfile_t Ezekiel Newren via GitGitGadget
2025-09-16 21:56 ` [PATCH 00/17] Use rust types in xdiff Junio C Hamano
2025-09-16 22:01 ` Ezekiel Newren
2025-09-17 2:16 ` Elijah Newren
2025-09-17 13:53 ` Junio C Hamano
2025-09-17 6:22 ` Junio C Hamano
2025-09-18 23:56 ` [PATCH v2 00/10] " Ezekiel Newren via GitGitGadget
2025-09-18 23:56 ` [PATCH v2 01/10] xdiff: delete static forward declarations in xprepare Ezekiel Newren via GitGitGadget
2025-09-18 23:56 ` [PATCH v2 02/10] xdiff: delete local variables and initialize/free xdfile_t directly Ezekiel Newren via GitGitGadget
2025-09-18 23:56 ` [PATCH v2 03/10] xdiff: delete unnecessary fields from xrecord_t and xdfile_t Ezekiel Newren via GitGitGadget
2025-09-18 23:56 ` [PATCH v2 04/10] xdiff: delete xdl_get_rec() in xemit Ezekiel Newren via GitGitGadget
2025-09-18 23:56 ` [PATCH v2 05/10] xdiff: delete struct diffdata_t Ezekiel Newren via GitGitGadget
2025-09-18 23:56 ` [PATCH v2 06/10] xdiff: delete redundant array xdfile_t.ha Ezekiel Newren via GitGitGadget
2025-09-18 23:56 ` [PATCH v2 07/10] xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_t Ezekiel Newren via GitGitGadget
2025-09-18 23:56 ` [PATCH v2 08/10] xdiff: delete chastore from xdfile_t Ezekiel Newren via GitGitGadget
2025-09-18 23:56 ` [PATCH v2 10/10] xdiff: treat xdfile_t.rchg like an enum Ezekiel Newren via GitGitGadget
2025-09-19 0:33 ` [PATCH v2 00/10] Use rust types in xdiff Junio C Hamano
2025-09-19 0:41 ` Ezekiel Newren
2025-09-19 15:15 ` Ezekiel Newren
2025-09-19 15:16 ` [PATCH v3 00/10] Cleanup xdfile_t and xrecord_t " Ezekiel Newren via GitGitGadget
2025-09-19 15:16 ` [PATCH v3 01/10] xdiff: delete static forward declarations in xprepare Ezekiel Newren via GitGitGadget
2025-09-20 17:16 ` Junio C Hamano
2025-09-20 17:41 ` Ezekiel Newren
2025-09-20 18:31 ` Elijah Newren
2025-09-20 22:25 ` Ben Knoble
2025-09-20 22:43 ` Junio C Hamano
2025-09-20 17:46 ` Ben Knoble
2025-09-20 18:46 ` Jeff King
2025-09-20 22:25 ` Ben Knoble
2025-09-20 22:52 ` Junio C Hamano
2025-09-20 23:15 ` Jeff King
2025-09-19 15:16 ` [PATCH v3 02/10] xdiff: delete local variables and initialize/free xdfile_t directly Ezekiel Newren via GitGitGadget
2025-09-20 17:36 ` Junio C Hamano
2025-09-19 15:16 ` [PATCH v3 03/10] xdiff: delete unnecessary fields from xrecord_t and xdfile_t Ezekiel Newren via GitGitGadget
2025-09-19 15:16 ` [PATCH v3 04/10] xdiff: delete xdl_get_rec() in xemit Ezekiel Newren via GitGitGadget
2025-09-20 17:48 ` Junio C Hamano
2025-09-21 13:06 ` Phillip Wood
2025-09-21 15:07 ` Ezekiel Newren
2025-09-19 15:16 ` [PATCH v3 05/10] xdiff: delete struct diffdata_t Ezekiel Newren via GitGitGadget
2025-09-21 13:06 ` Phillip Wood
2025-09-21 16:03 ` Ezekiel Newren
2025-09-19 15:16 ` [PATCH v3 06/10] xdiff: delete redundant array xdfile_t.ha Ezekiel Newren via GitGitGadget
2025-09-19 15:16 ` [PATCH v3 07/10] xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_t Ezekiel Newren via GitGitGadget
2025-09-21 13:06 ` Phillip Wood
2025-09-21 16:07 ` Ezekiel Newren
2025-09-19 15:16 ` [PATCH v3 08/10] xdiff: delete chastore from xdfile_t Ezekiel Newren via GitGitGadget
2025-09-19 15:16 ` [PATCH v3 09/10] xdiff: delete rchg aliasing Ezekiel Newren via GitGitGadget
2025-09-21 13:07 ` Phillip Wood
2025-09-21 16:37 ` Ezekiel Newren
2025-09-19 15:16 ` [PATCH v3 10/10] xdiff: treat xdfile_t.rchg like an enum Ezekiel Newren via GitGitGadget
2025-09-21 0:00 ` Junio C Hamano
2025-09-21 0:38 ` Ezekiel Newren
2025-09-21 9:19 ` Phillip Wood
2025-09-21 16:11 ` Ezekiel Newren
2025-09-19 23:30 ` [PATCH v3 00/10] Cleanup xdfile_t and xrecord_t in xdiff Elijah Newren
2025-09-19 23:37 ` Ezekiel Newren
2025-09-22 19:51 ` [PATCH v4 00/12] " Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 01/12] xdiff: delete static forward declarations in xprepare Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 02/12] xdiff: delete local variables and initialize/free xdfile_t directly Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 03/12] xdiff: delete unnecessary fields from xrecord_t and xdfile_t Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 04/12] xdiff: delete superfluous function xdl_get_rec() in xemit Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 05/12] xdiff: delete superfluous local variables that alias fields in xrecord_t Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 06/12] xdiff: delete struct diffdata_t Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 07/12] xdiff: delete redundant array xdfile_t.ha Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 08/12] xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_t Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 09/12] xdiff: delete chastore from xdfile_t Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 10/12] xdiff: delete rchg aliasing Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 11/12] xdiff: use bool literals for xdfile_t.rchg Ezekiel Newren via GitGitGadget
2025-09-22 19:51 ` [PATCH v4 12/12] xdiff: refactor 'char *rchg' to 'bool *changed' in xdfile_t Ezekiel Newren via GitGitGadget
2025-09-22 22:39 ` [PATCH v4 00/12] Cleanup xdfile_t and xrecord_t in xdiff Junio C Hamano
2025-09-23 0:13 ` Ezekiel Newren
2025-09-23 1:06 ` Junio C Hamano
2025-09-23 1:30 ` Ezekiel Newren
2025-09-23 14:12 ` Junio C Hamano
2025-09-23 16:50 ` Ezekiel Newren
2025-09-23 21:24 ` [PATCH v5 00/13] " Ezekiel Newren via GitGitGadget
2025-09-23 21:24 ` [PATCH v5 01/13] xdiff: delete static forward declarations in xprepare Ezekiel Newren via GitGitGadget
2025-09-23 21:24 ` [PATCH v5 02/13] xdiff: delete local variables and initialize/free xdfile_t directly Ezekiel Newren via GitGitGadget
2025-09-23 21:24 ` [PATCH v5 03/13] xdiff: delete unnecessary fields from xrecord_t and xdfile_t Ezekiel Newren via GitGitGadget
2025-09-23 21:24 ` [PATCH v5 04/13] xdiff: delete superfluous function xdl_get_rec() in xemit Ezekiel Newren via GitGitGadget
2025-09-30 13:31 ` Kristoffer Haugsbakk
2025-09-30 19:35 ` Ezekiel Newren
2025-09-30 20:05 ` Junio C Hamano
2025-09-23 21:24 ` [PATCH v5 05/13] xdiff: delete superfluous local variables that alias fields in xrecord_t Ezekiel Newren via GitGitGadget
2025-09-24 10:22 ` Phillip Wood
2025-09-24 14:52 ` Ezekiel Newren
2025-09-23 21:24 ` [PATCH v5 06/13] xdiff: delete struct diffdata_t Ezekiel Newren via GitGitGadget
2025-09-23 21:24 ` [PATCH v5 07/13] xdiff: delete redundant array xdfile_t.ha Ezekiel Newren via GitGitGadget
2025-09-23 21:24 ` [PATCH v5 08/13] xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_t Ezekiel Newren via GitGitGadget
2025-09-23 21:24 ` [PATCH v5 09/13] xdiff: delete chastore from xdfile_t Ezekiel Newren via GitGitGadget
2025-09-23 21:24 ` [PATCH v5 10/13] xdiff: delete rchg aliasing Ezekiel Newren via GitGitGadget
2025-09-24 10:22 ` Phillip Wood
2025-09-24 15:01 ` Ezekiel Newren
2025-09-24 15:34 ` Junio C Hamano
2025-09-24 15:58 ` Ezekiel Newren
2025-09-24 21:31 ` Junio C Hamano
2025-09-24 22:46 ` Ezekiel Newren
2025-09-25 7:09 ` Junio C Hamano
2025-09-25 22:02 ` Ezekiel Newren
2025-09-23 21:24 ` [PATCH v5 11/13] xdiff: rename rchg -> changed in xdfile_t Ezekiel Newren via GitGitGadget
2025-09-24 10:22 ` Phillip Wood
2025-09-24 15:10 ` Ezekiel Newren
2025-09-24 15:18 ` Phillip Wood
2025-09-23 21:24 ` [PATCH v5 12/13] xdiff: use enum macros NONE(0), SOME(1), TOO_MANY(2) in xprepare.c Ezekiel Newren via GitGitGadget
2025-09-24 10:21 ` Phillip Wood
2025-09-24 14:46 ` Ezekiel Newren
2025-09-24 15:18 ` Phillip Wood
2025-09-24 17:29 ` Junio C Hamano
2025-09-25 18:40 ` Ezekiel Newren
2025-09-26 2:29 ` Ezekiel Newren
2025-09-23 21:24 ` [PATCH v5 13/13] xdiff: change type of xdfile_t.changed from char to bool Ezekiel Newren via GitGitGadget
2025-09-24 10:21 ` Phillip Wood
2025-09-24 15:14 ` Ezekiel Newren
2025-09-26 22:41 ` [PATCH v6 00/12] Cleanup xdfile_t and xrecord_t in xdiff Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 01/12] xdiff: delete static forward declarations in xprepare Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 02/12] xdiff: delete local variables and initialize/free xdfile_t directly Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 03/12] xdiff: delete unnecessary fields from xrecord_t and xdfile_t Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 04/12] xdiff: delete superfluous function xdl_get_rec() in xemit Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 05/12] xdiff: delete local variables that alias fields in xrecord_t Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 06/12] xdiff: delete struct diffdata_t Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 07/12] xdiff: delete redundant array xdfile_t.ha Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 08/12] xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_t Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 09/12] xdiff: delete chastore from xdfile_t Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 10/12] xdiff: rename rchg -> changed in xdfile_t Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 11/12] xdiff: add macros DISCARD(0), KEEP(1), INVESTIGATE(2) in xprepare.c Ezekiel Newren via GitGitGadget
2025-09-26 22:41 ` [PATCH v6 12/12] xdiff: change type of xdfile_t.changed from char to bool Ezekiel Newren via GitGitGadget
2025-10-03 13:47 ` Phillip Wood [this message]
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=01959215-3cb5-4c12-91eb-1b28e18addf9@gmail.com \
--to=phillip.wood123@gmail$(echo .)com \
--cc=ben.knoble@gmail$(echo .)com \
--cc=ezekielnewren@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=newren@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=phillip.wood@dunelm$(echo .)org.uk \
/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