git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] gitk: Use git-difftool for external diffs

From
David Aguilar <davvid@gmail.com>
Date
Dec 31, 2009, 07:16 UTC
Message-ID
<20091231071642.GA10067@gmail.com>
In-Reply-To
<7vy6kk52an.fsf@alter.siamese.dyndns.org>
On Tue, Dec 29, 2009 at 11:49:52PM -0800, Junio C Hamano wrote:
Show 10 quoted lines
> Nanako Shiraishi <nanako3@lavabit.com> writes:
> 
> > Junio, could you tell us what happened to this thread?
> 
> See http://thread.gmane.org/gmane.comp.version-control.git/132983/focus=133414
> 
> In short, the particular way to call difftool this patch implements was
> found to be inadequate to support existing external diff support by gitk
> and a small difftool update will happen first, followed by a patch to gitk
> to use the updated difftool, to avoid regression.
I started the first step:

http://thread.gmane.org/gmane.comp.version-control.git/135613 http://thread.gmane.org/gmane.comp.version-control.git/135613/focus=135612

The 2nd patch implements the the --gui option which Markus pointed out would be needed to avoid issues such as calling "vimdiff" from a console-less gitk:

http://article.gmane.org/gmane.comp.version-control.git/133386

I marked the --gui patch as "RFC" since it introduced a new config variable and I want to make sure that we agreed on its name. I didn't get any feedback about that patch (my fault-- we were in RC freeze and I forgot to CC: Markus).

If that looks like a good first step then we can do the next step which would be to introduce the --extcmd= option as mentioned here:

http://thread.gmane.org/gmane.comp.version-control.git/132983/focus=133386

I will try and prepare the changes for --extcmd= within the next week assuming the existing --gui patch is ok.

On a related note, Jay Soffian recently submitted a git-mergetool--lib patch adding support for "diffmerge". It made it clear that there were parts of git-mergetool--lib that could use some refactoring:

http://thread.gmane.org/gmane.comp.version-control.git/134906

Jay did mention that he'd give it a shot at the time, though it does seems like the refactoring could wait until we see how --extcmd= fits into the world.

Thank you for following up on this thread, Nanako.
-- 
		David
Previous: Junio C HamanoNext: Junio C Hamano
Message 12 of 13 in “gitk: Use git-difftool for external diffs”
  1. gitk: Use git-difftool for external diffsDavid Aguilar, Nov 16, 2009
  2. Paul MackerrasNov 19, 2009
  3. David AguilarNov 19, 2009
  4. Paul MackerrasNov 19, 2009
  5. Junio C HamanoNov 20, 2009
  6. David AguilarNov 20, 2009
  7. Junio C HamanoNov 20, 2009
  8. David AguilarNov 21, 2009
  9. Markus HeidelbergNov 20, 2009
  10. Nanako ShiraishiDec 30, 2009
  11. Junio C HamanoDec 30, 2009
  12. David AguilarDec 31, 2009
  13. Junio C HamanoDec 31, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.