From: Max Kirillov <max@max630.net>
To: Paul Mackerras <paulus@samba.org>
Cc: git@vger.kernel.org
Subject: [PATCH 2/3] gitk: refactor: separate io from logic in the searching origin of line
Date: Tue, 4 Feb 2014 00:42:12 +0200 [thread overview]
Message-ID: <20140203224212.GB5136@wheezy.local> (raw)
In-Reply-To: <20140203223346.GA14202@wheezy.local>
The pattern of maintaining blame command and collecting output
can be reused for searching of latest change to region.
It still can use the blame's global variables, because the two
search commands should not run concurrently as well as two instances
of blame.
Signed-off-by: Max Kirillov <max@max630.net>
---
gitk | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/gitk b/gitk
index 7699a66..eef88a1 100755
--- a/gitk
+++ b/gitk
@@ -3771,7 +3771,7 @@ proc external_blame {parent_idx {line {}}} {
}
proc show_line_source {} {
- global cmitmode currentid parents curview blamestuff blameinst
+ global cmitmode currentid parents curview
global diff_menu_line diff_menu_filebase flist_menu_file
global nullid nullid2 gitdir cdup
@@ -3827,6 +3827,12 @@ proc show_line_source {} {
lappend blameargs $id
}
lappend blameargs -- [file join $cdup $flist_menu_file]
+ startblaming $blameargs read_line_source
+}
+
+proc startblaming {blameargs blamecommand} {
+ global blamestuff blameinst
+
if {[catch {
set f [open $blameargs r]
} err]} {
@@ -3838,7 +3844,7 @@ proc show_line_source {} {
set i [reg_instance $f]
set blamestuff {}
set blameinst $i
- filerun $f [list read_line_source $f $i]
+ filerun $f [list blameiocallback $f $i $blamecommand]
}
proc stopblaming {} {
@@ -3852,8 +3858,8 @@ proc stopblaming {} {
}
}
-proc read_line_source {fd inst} {
- global blamestuff curview commfd blameinst nullid nullid2
+proc blameiocallback {fd inst blamecommand} {
+ global blamestuff blameinst commfd
while {[gets $fd line] >= 0} {
lappend blamestuff $line
@@ -3871,6 +3877,14 @@ proc read_line_source {fd inst} {
return 0
}
+ $blamecommand
+ unset blamestuff
+ return 0
+}
+
+proc read_line_source {} {
+ global blamestuff curview nullid nullid2
+
set fname {}
set line [split [lindex $blamestuff 0] " "]
set id [lindex $line 0]
@@ -3901,7 +3915,6 @@ proc read_line_source {fd inst} {
} else {
puts "oops couldn't parse git blame output"
}
- unset blamestuff
return 0
}
--
1.8.5.2.421.g4cdf8d0
next prev parent reply other threads:[~2014-02-03 22:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-03 20:53 [PATCH] gitk: use single blamestuff for all show_line_source{} calls Max Kirillov
2014-02-03 22:34 ` [PATCH 0/3] gitk: show latest change to region Max Kirillov
2014-02-03 22:41 ` [PATCH 1/3] gitk: refactor: separate generic hunk parsing out of find_hunk_blamespecs{} Max Kirillov
2014-02-03 23:20 ` Eric Sunshine
2014-06-24 18:27 ` Max Kirillov
2014-02-03 22:42 ` Max Kirillov [this message]
2014-02-03 22:42 ` [PATCH 3/3] gitk: pick selection for region blame Max Kirillov
2014-02-03 22:48 ` [PATCH 3/3 v2] gitk: show latest change to region Max Kirillov
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=20140203224212.GB5136@wheezy.local \
--to=max@max630.net \
--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.
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).