* [PATCH (resend 3)] git gui: Use git diff --submodule when available
@ 2010-01-23 22:04 Jens Lehmann
2010-01-23 22:34 ` Shawn O. Pearce
0 siblings, 1 reply; 3+ messages in thread
From: Jens Lehmann @ 2010-01-23 22:04 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Git Mailing List
The necessary feature is present since 1.6.6, it would be good
to have this patch in the next release (see numbers below).
Shawn, This is a third re-send, in case you missed the previous
rounds. Thanks.
-- >8 --
Subject: [PATCH] git gui: Use git diff --submodule when available
Doing so is much faster and gives the same output. Here are some
numbers:
time git submodule summary
<snip>
real 0m0.219s
user 0m0.050s
sys 0m0.111s
time git diff --submodule
<snip>
real 0m0.012s
user 0m0.003s
sys 0m0.009s
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
---
git-gui/lib/diff.tcl | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index bd5d189..0623e3e 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -281,6 +281,14 @@ proc start_show_diff {cont_info {add_opts {}}} {
}
}
+ if {[git-version >= "1.6.6"]} {
+ if {[string match {160000 *} [lindex $s 2]]
+ || [string match {160000 *} [lindex $s 3]]} {
+ set is_submodule_diff 1
+ lappend cmd --submodule
+ }
+ }
+
lappend cmd -p
lappend cmd --no-color
if {$repo_config(gui.diffcontext) >= 1} {
@@ -296,16 +304,6 @@ proc start_show_diff {cont_info {add_opts {}}} {
lappend cmd $path
}
- if {[string match {160000 *} [lindex $s 2]]
- || [string match {160000 *} [lindex $s 3]]} {
- set is_submodule_diff 1
- if {$w eq $ui_index} {
- set cmd [list submodule summary --cached -- $path]
- } else {
- set cmd [list submodule summary --files -- $path]
- }
- }
-
if {[catch {set fd [eval git_read --nice $cmd]} err]} {
set diff_active 0
unlock_index
@@ -387,8 +385,7 @@ proc read_diff {fd cont_info} {
}
} elseif {$is_submodule_diff} {
if {$line == ""} continue
- if {[regexp {^\* } $line]} {
- set line [string replace $line 0 1 {Submodule }]
+ if {[regexp {^Submodule } $line]} {
set tags d_@
} else {
set op [string range $line 0 2]
--
1.6.6.1.558.gc20e6.dirty
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH (resend 3)] git gui: Use git diff --submodule when available
2010-01-23 22:04 [PATCH (resend 3)] git gui: Use git diff --submodule when available Jens Lehmann
@ 2010-01-23 22:34 ` Shawn O. Pearce
2010-01-23 22:42 ` Jens Lehmann
0 siblings, 1 reply; 3+ messages in thread
From: Shawn O. Pearce @ 2010-01-23 22:34 UTC (permalink / raw)
To: Jens Lehmann; +Cc: Git Mailing List
Jens Lehmann <Jens.Lehmann@web.de> wrote:
> The necessary feature is present since 1.6.6, it would be good
> to have this patch in the next release (see numbers below).
>
> Shawn, This is a third re-send, in case you missed the previous
> rounds. Thanks.
I didn't miss them, I just was ignoring git-gui patches for a while.
I only work on git-gui in short spurts.
I actually just applied a modified version of your patch, so diff
on submodules still works via submodule summary if git < 1.6.6.
--
Shawn.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH (resend 3)] git gui: Use git diff --submodule when available
2010-01-23 22:34 ` Shawn O. Pearce
@ 2010-01-23 22:42 ` Jens Lehmann
0 siblings, 0 replies; 3+ messages in thread
From: Jens Lehmann @ 2010-01-23 22:42 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Git Mailing List
Am 23.01.2010 23:34, schrieb Shawn O. Pearce:
> I actually just applied a modified version of your patch, so diff
> on submodules still works via submodule summary if git < 1.6.6.
One caveat: This will only work in versions 1.6.4 and above, as i
had to add the --files option to git submodule summary to make it
work.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-01-23 22:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-23 22:04 [PATCH (resend 3)] git gui: Use git diff --submodule when available Jens Lehmann
2010-01-23 22:34 ` Shawn O. Pearce
2010-01-23 22:42 ` Jens Lehmann
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 NNTP newsgroup(s).