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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
