All of lore.kernel.org
 help / color / mirror / Atom feed
From: bdowning@lavos.net (Brian Downing)
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCHv3 1/2] Make xdi_diff_outf interface for running xdiff_outf diffs
Date: Wed, 20 Aug 2008 22:37:57 -0500	[thread overview]
Message-ID: <20080821033756.GC31114@lavos.net> (raw)
In-Reply-To: <7v1w0sf7bl.fsf@gitster.siamese.dyndns.org>

On Wed, Aug 13, 2008 at 11:18:22PM -0700, Junio C Hamano wrote:
> Much nicer.  xdi_diff() is just a performance thing that only kicks in
> when you are running -U0 diff, so it is unsurprising that you did not see
> any test failures.

Interesting point here.  In playing with trying to cache the diff hashes
to speed up blame, I had to basically disable the xdi_diff tail trimming
when building the hash the first time, because it needed to see the
whole file.  In doing this, I discovered that just changing from
xdi_diff to xdl_diff /does/ change the blame -M -C -C --incremental
result for my test case.  (Unfortunately, my test case is proprietary
code...)

Is this expected, or some kind of serious bug with xdi_diff?

    :; diff proper-output other-output
    980c980
    < dee86dd25736e1778122cfde7d7455a3ef85e37d 173 173 2
    ---
    > dee86dd25736e1778122cfde7d7455a3ef85e37d 172 172 3
    982c982
    < dee86dd25736e1778122cfde7d7455a3ef85e37d 183 183 2
    ---
    > dee86dd25736e1778122cfde7d7455a3ef85e37d 184 184 1
    1509c1509
    < c6966941ebfaa1dc9b29489e53d6d7f41e52d357 287 384 1
    ---
    > c6966941ebfaa1dc9b29489e53d6d7f41e52d357 284 381 1
    1511c1511
    < c6966941ebfaa1dc9b29489e53d6d7f41e52d357 301 399 2
    ---
    > c6966941ebfaa1dc9b29489e53d6d7f41e52d357 286 383 2
    1513c1513
    < c6966941ebfaa1dc9b29489e53d6d7f41e52d357 304 402 1
    ---
    > c6966941ebfaa1dc9b29489e53d6d7f41e52d357 301 399 1
    1608c1608
    < ecebfe8121dfd9c5836d47bbeb910fbb8f96f35c 252 381 1
    ---
    > ecebfe8121dfd9c5836d47bbeb910fbb8f96f35c 252 385 1
    1610c1610
    < ecebfe8121dfd9c5836d47bbeb910fbb8f96f35c 255 383 1
    ---
    > ecebfe8121dfd9c5836d47bbeb910fbb8f96f35c 255 400 1
    1612c1612
    < ecebfe8121dfd9c5836d47bbeb910fbb8f96f35c 257 385 1
    ---
    > ecebfe8121dfd9c5836d47bbeb910fbb8f96f35c 257 402 1
    1945c1945
    < a325ab86914b15107bf0211550c7d0568fb0854c 138 172 1
    ---
    > a325ab86914b15107bf0211550c7d0568fb0854c 138 183 1

-bcd

  parent reply	other threads:[~2008-08-21  3:39 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-13  7:05 [PATCH 1/2] Make xdiff_outf_{init,release} interface Brian Downing
2008-08-14  0:46 ` Junio C Hamano
2008-08-14  2:06   ` Brian Downing
2008-08-14  2:13     ` Junio C Hamano
2008-08-14  5:13       ` [PATCHv2 1/2] Make xdi_diff_outf interface for running xdiff_outf diffs Brian Downing
2008-08-14  5:13         ` [PATCHv2 2/2] Use strbuf for struct xdiff_emit_state's remainder Brian Downing
2008-08-14  5:31         ` [PATCHv2 1/2] Make xdi_diff_outf interface for running xdiff_outf diffs Brian Downing
2008-08-14  5:36           ` [PATCHv3 " Brian Downing
2008-08-14  5:36             ` [PATCHv3 2/2] Use strbuf for struct xdiff_emit_state's remainder Brian Downing
2008-08-14  6:18             ` [PATCHv3 1/2] Make xdi_diff_outf interface for running xdiff_outf diffs Junio C Hamano
2008-08-14  6:34               ` Brian Downing
2008-08-21  3:37               ` Brian Downing [this message]
2008-08-21  5:24                 ` Junio C Hamano
2008-08-21  6:29                   ` Brian Downing

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=20080821033756.GC31114@lavos.net \
    --to=bdowning@lavos.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.