From: Steffen Prohaska <prohaska@zib.de>
To: git@vger.kernel.org
Cc: Steffen Prohaska <prohaska@zib.de>
Subject: [RFC 2/4] gitk: Add diff-diff support
Date: Sat, 15 Dec 2007 17:51:43 +0100 [thread overview]
Message-ID: <1197737505599-git-send-email-prohaska@zib.de> (raw)
In-Reply-To: <1197737505128-git-send-email-prohaska@zib.de>
---
gitk-git/gitk | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 1da0b0a..ca121e4 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -1019,6 +1019,8 @@ proc makewindow {} {
-command {diffvssel 0}
$rowctxmenu add command -label "Diff selected -> this" \
-command {diffvssel 1}
+ $rowctxmenu add command -label "Diff Diff selected -> this" \
+ -command {diffdiffvssel 1}
$rowctxmenu add command -label "Make patch" -command mkpatch
$rowctxmenu add command -label "Create tag" -command mktag
$rowctxmenu add command -label "Write commit to file" -command writecommit
@@ -6010,6 +6012,50 @@ proc doseldiff {oldid newid} {
startdiff [list $oldid $newid]
}
+proc diffdiffvssel {dirn} {
+ global rowmenuid selectedline displayorder
+
+ if {![info exists selectedline]} return
+ if {$dirn} {
+ set oldid [lindex $displayorder $selectedline]
+ set newid $rowmenuid
+ } else {
+ set oldid $rowmenuid
+ set newid [lindex $displayorder $selectedline]
+ }
+ addtohistory [list doseldiffdiff $oldid $newid]
+ doseldiffdiff $oldid $newid
+}
+
+proc doseldiffdiff {oldid newid} {
+ global ctext
+ global commitinfo
+
+ $ctext conf -state normal
+ clear_ctext
+ init_flist "Top"
+ $ctext insert end "From Commit "
+ $ctext insert end $oldid link0
+ setlink $oldid link0
+ $ctext insert end "\n "
+ $ctext insert end [lindex $commitinfo($oldid) 0]
+ $ctext insert end "\n\nTo Commit "
+ $ctext insert end $newid link1
+ setlink $newid link1
+ $ctext insert end "\n "
+ $ctext insert end [lindex $commitinfo($newid) 0]
+ $ctext insert end "\n"
+ $ctext insert end "\n"
+ $ctext conf -state disabled
+ $ctext tag remove found 1.0 end
+
+ set diff [exec git diff-diff $oldid $newid]
+ $ctext conf -state normal
+ $ctext insert end "\n"
+ $ctext insert end $diff
+ $ctext conf -state disabled
+}
+
proc mkpatch {} {
global rowmenuid currentid commitinfo patchtop patchnum
--
1.5.4.rc0.37.geff3a-dirty
next prev parent reply other threads:[~2007-12-15 16:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-15 16:51 [RFC 1/4] Add diff-diff, which compares the diffs of two commits Steffen Prohaska
2007-12-15 16:51 ` Steffen Prohaska [this message]
2007-12-15 16:51 ` [RFC 3/4] gitk: Refactor getblobdiffline to split off adddiffline Steffen Prohaska
2007-12-15 16:51 ` [RFC 4/4] gitk: Use adddiffline to nicely format diff-diff Steffen Prohaska
2007-12-15 16:55 ` [RFC 1/4] Add diff-diff, which compares the diffs of two commits Johannes Schindelin
2007-12-15 17:04 ` Björn Steinbrink
2007-12-15 17:33 ` Steffen Prohaska
2007-12-15 19:34 ` Junio C Hamano
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=1197737505599-git-send-email-prohaska@zib.de \
--to=prohaska@zib.de \
--cc=git@vger.kernel.org \
/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.