git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Pierre Marc Dumuid <pierre.dumuid@adelaide.edu.au>
Cc: git@vger.kernel.org
Subject: Re: PATCH to add a button to perform a meld on the current file
Date: Fri, 7 Sep 2007 12:25:12 +0100 (BST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0709071214330.28586@racer.site> (raw)
In-Reply-To: <46E0D79E.3080606@adelaide.edu.au>

Hi,

On Fri, 7 Sep 2007, Pierre Marc Dumuid wrote:

> Here's a dodgy [not that good] patch to perform a GUI comparison on a 
> file. It is dodgy because it assumes cogito is installed, and you want 
> to use meld, and it doesn't remove the temporary files.

cogito is phased out.

> Not expecting this to go into main branch, but I find it handy for my 
> own purposes nether-the-less.

Just in case you want to get it in, here are some comments (made harder by 
the fact that you did not follow Documentation/SubmittingPatches)...

> --- /usr/bin/gitk	2007-08-06 07:55:41.000000000 +0930
> +++ /home/pmdumuid/bin/gitkpmd	2007-09-07 14:09:28.000000000 +0930

You might want to consider using format-patch next time ;-)

> @@ -4564,6 +4566,19 @@
>      }
>  }
>  
> +proc doguidiff {} {
> +    global cflist sha1string
> +
> +    set taglist [$cflist tag ranges highlight]
> +    set from [lindex $taglist 0]
> +    set to [lindex $taglist 1]
> +
> +    set fname [$cflist get $from $to]
> +    exec cg-admin-cat -r $sha1string^ $fname > .gitk_diffolder
> +    exec cg-admin-cat -r $sha1string $fname > .gitk_diffnewer

This can be be achieved by "git cat-file -t blob $sha1string^:$fname", and 
likewise for $sha1string.

+    exec meld .gitk_diffolder .gitk_diffnewer &
+}

Hmm.  If you allow it to block, you might have more chances to clean up 
the temporary files...

Also, it would be nice to have it configurable which tool you use, a la 
git-mergetool.

Ciao,
Dscho
 

      reply	other threads:[~2007-09-07 11:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-07  4:46 Pierre Marc Dumuid
2007-09-07 11:25 ` Johannes Schindelin [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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.64.0709071214330.28586@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=pierre.dumuid@adelaide.edu.au \
    --subject='Re: PATCH to add a button to perform a meld on the current file' \
    /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

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).