Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: "Alex Riesen" <raa.lkml@gmail.com>
Cc: "Junio C Hamano" <junkio@cox.net>,
	"Timo Hirvonen" <tihirvon@gmail.com>,
	git@vger.kernel.org
Subject: Re: Notes on diffcore API
Date: Tue, 27 Jun 2006 16:33:22 -0700	[thread overview]
Message-ID: <7vbqse6unx.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 81b0412b0606270141x7e38af5i8a97b27e37da17bf@mail.gmail.com

"Alex Riesen" <raa.lkml@gmail.com> writes:

> On 6/27/06, Junio C Hamano <junkio@cox.net> wrote:
>> -- >8 --
>> Notes on diffcore API
>> =====================
>
> Thanks!
>
>> Diffcore Transformation
>> -----------------------
>>
>> The input file pairs recorded in the previous phase are
>> collected in diff_queued_diff (a global variable -- which means
>> that you cannot have two diffs running in parallel with the
>> current setup).  This is an expandable array of pointers to
>> `struct diff_filepair` structure.
>>
>
> merge-recursive shouldn't have any problems with that, as the
> renames are just read in the current implementation.
> Still, it is somehow uncomfortable to see the amount of APIs
> with the above restriction. Never know when it'll bite.

I think it is simply the matter of moving diff_queued_diff a
field in diff_optionss structure and adding an extra parameter
to point at the current diff_options to handful functions if we
ever need to support it.  I haven't bothered doing that because
we haven't had the need to run more than one diff at once.

  reply	other threads:[~2006-06-27 23:33 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-26 23:38 CFT: merge-recursive in C Alex Riesen
2006-06-26 23:42 ` CFT: merge-recursive in C (test updates) Alex Riesen
2006-06-26 23:54 ` CFT: merge-recursive in C Linus Torvalds
2006-06-27  0:07   ` Linus Torvalds
2006-06-27  0:24     ` Alex Riesen
2006-06-27  0:27       ` Junio C Hamano
2006-06-27  0:17   ` Alex Riesen
2006-06-27  0:25 ` Junio C Hamano
2006-06-27  0:38   ` Alex Riesen
2006-06-27  7:28   ` Notes on diffcore API Junio C Hamano
2006-06-27  8:41     ` Alex Riesen
2006-06-27 23:33       ` Junio C Hamano [this message]
2006-06-28  7:36         ` Johannes Schindelin
2006-06-27  7:52 ` CFT: merge-recursive in C Johannes Schindelin
2006-06-27  8:58   ` Alex Riesen
2006-06-27 10:51     ` Johannes Schindelin
2006-06-27 11:53       ` Alex Riesen
2006-06-27 17:05       ` Junio C Hamano
2006-06-27 12:17 ` Alex Riesen
2006-06-27 12:43   ` Johannes Schindelin
2006-06-27 14:09     ` Alex Riesen
2006-06-28  6:37 ` Uwe Zeisberger
2006-06-28  7:32   ` Alex Riesen
2006-06-28  9:22   ` Junio C Hamano
2006-06-28 15:06 ` Christopher Faylor
2006-06-29  0:38   ` Alex Riesen
2006-06-29  0:49     ` Christopher Faylor

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=7vbqse6unx.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=raa.lkml@gmail.com \
    --cc=tihirvon@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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox