From: Stefan Haller <lists@haller-berlin.de>
To: Paul Mackerras <paulus@samba.org>
Cc: git@vger.kernel.org
Subject: [PATCH] gitk: Add "First parent" checkbox
Date: Mon, 8 Nov 2010 12:58:14 +0100 [thread overview]
Message-ID: <1289217494-69931-1-git-send-email-lists@haller-berlin.de> (raw)
Sometimes it's desirable to see what changes were introduced by a
merge commit, rather than how conflicts were resolved. This adds
a checkbox which, when turned on, makes gitk show the equivalent
of "git show --first-parent <commit>" for merge commits.
Signed-off-by: Stefan Haller <stefan@haller-berlin.de>
---
I realize this conflicts with Thomas Rast's recent path to add a
word-diff dropdown box; things are fighting for space in the diff
pane header...
gitk | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/gitk b/gitk
index 45e3380..db0f022 100755
--- a/gitk
+++ b/gitk
@@ -2245,6 +2245,9 @@ proc makewindow {} {
${NS}::checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \
-command changeignorespace -variable ignorespace
pack .bleft.mid.ignspace -side left -padx 5
+ ${NS}::checkbutton .bleft.mid.firstparent -text [mc "First parent"] \
+ -command changefirstparent -variable firstparent
+ pack .bleft.mid.firstparent -side left -padx 5
set ctext .bleft.bottom.ctext
text $ctext -background $bgcolor -foreground $fgcolor \
-state disabled -font textfont \
@@ -6872,6 +6875,7 @@ proc selectline {l isnew {desired_loc {}}} {
global cmitmode showneartags allcommits
global targetrow targetid lastscrollrows
global autoselect jump_to_here
+ global firstparent
catch {unset pending_select}
$canv delete hover
@@ -7013,7 +7017,7 @@ proc selectline {l isnew {desired_loc {}}} {
init_flist [mc "Comments"]
if {$cmitmode eq "tree"} {
gettree $id
- } elseif {[llength $olds] <= 1} {
+ } elseif {[llength $olds] <= 1 || $firstparent} {
startdiff $id
} else {
mergediff $id
@@ -7416,7 +7420,7 @@ proc diffcmd {ids flags} {
proc gettreediffs {ids} {
global treediff treepending
- if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return
+ if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id -m --first-parent}] r]}]} return
set treepending $ids
set treediff {}
@@ -7504,11 +7508,19 @@ proc changeignorespace {} {
reselectline
}
+proc changefirstparent {} {
+ global treediffs
+ catch {unset treediffs}
+
+ reselectline
+}
+
proc getblobdiffs {ids} {
global blobdifffd diffids env
global diffinhdr treediffs
global diffcontext
global ignorespace
+ global firstparent
global limitdiffs vfilelimit curview
global diffencoding targetline diffnparents
global git_version currdiffsubmod
@@ -7521,10 +7533,15 @@ proc getblobdiffs {ids} {
if {[package vcompare $git_version "1.6.6"] >= 0} {
set submodule "--submodule"
}
- set cmd [diffcmd $ids "-p $textconv $submodule -C --cc --no-commit-id -U$diffcontext"]
+ set cmd [diffcmd $ids "-p $textconv $submodule -C --no-commit-id -U$diffcontext"]
if {$ignorespace} {
append cmd " -w"
}
+ if {$firstparent} {
+ append cmd " -m --first-parent"
+ } else {
+ append cmd " --cc"
+ }
if {$limitdiffs && $vfilelimit($curview) ne {}} {
set cmd [concat $cmd -- $vfilelimit($curview)]
}
@@ -11393,6 +11410,7 @@ if {[tk windowingsystem] eq "win32"} {
set diffcolors {red "#00a000" blue}
set diffcontext 3
set ignorespace 0
+set firstparent 0
set markbgcolor "#e0e0ff"
set circlecolors {white blue gray blue blue}
--
1.7.3.2.153.g8250e
next reply other threads:[~2010-11-08 11:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-08 11:58 Stefan Haller [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-30 17:10 Show patch in gitk --first-parent ? Karl Wiberg
2013-10-31 14:59 ` [PATCH] gitk: Add "First parent" checkbox Stefan Haller
2010-11-08 10:42 Stefan Haller
2010-11-08 17:24 ` Jonathan Nieder
2010-11-08 19:40 ` Stefan Haller
2010-11-08 19:48 ` Jonathan Nieder
2010-11-08 20:23 ` Stefan Haller
2010-11-08 21:11 ` Jonathan Nieder
2010-11-10 7:17 ` Stefan Haller
2010-12-12 4:27 ` Paul Mackerras
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=1289217494-69931-1-git-send-email-lists@haller-berlin.de \
--to=lists@haller-berlin.de \
--cc=git@vger.kernel.org \
--cc=paulus@samba.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.
Code repositories for project(s) associated with this public 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).