@matheusbsbs / matheus-bagliano / commits / a8aaf19c41
Fork 0

gitk: Use git-rev-parse only to identify file/dir names on cmd line

This uses git-rev-parse --no-revs --no-flags to give us just the file and directory names on the command line, so that we can create the "Command line" view if any were specified. All other arguments just get passed to git-rev-list (without a pass through git-rev-parse). Signed-off-by: Paul Mackerras <paulus@samba.org>

Paul Mackerras committed Apr 23, 2006 at 22:45 UTC a8aaf19c419a30d335f0640ab644112ecda6dd12
1 file changed +23 -50
gitk
+23 -50
@@ -16,56 +16,26 @@ proc gitdir {} {
16 }
17 }
18
19 -proc parse_args {rargs} {
20 - global parsed_args cmdline_files
21 -
22 - set parsed_args {}
23 - set cmdline_files {}
24 - if {[catch {
25 - set args [concat --default HEAD $rargs]
26 - set args [split [eval exec git-rev-parse $args] "\n"]
27 - set i 0
28 - foreach arg $args {
29 - if {![regexp {^[0-9a-f]{40}$} $arg]} {
30 - if {$arg eq "--"} {
31 - incr i
32 - }
33 - set cmdline_files [lrange $args $i end]
34 - break
35 - }
36 - lappend parsed_args $arg
37 - incr i
38 - }
39 - }]} {
40 - # if git-rev-parse failed for some reason...
41 - set i [lsearch -exact $rargs "--"]
42 - if {$i >= 0} {
43 - set cmdline_files [lrange $rargs [expr {$i+1}] end]
44 - set rargs [lrange $rargs 0 [expr {$i-1}]]
45 - }
46 - if {$rargs == {}} {
47 - set parsed_args HEAD
48 - } else {
49 - set parsed_args $rargs
50 - }
51 - }
52 -}
53 -
54 -proc start_rev_list {rlargs} {
19 +proc start_rev_list {} {
20 global startmsecs nextupdate ncmupdate
21 global commfd leftover tclencoding datemode
22 + global revtreeargs curview viewfiles
23
24 set startmsecs [clock clicks -milliseconds]
25 set nextupdate [expr {$startmsecs + 100}]
26 set ncmupdate 1
27 initlayout
28 + set args $revtreeargs
29 + if {$viewfiles($curview) ne {}} {
30 + set args [concat $args "--" $viewfiles($curview)]
31 + }
32 set order "--topo-order"
33 if {$datemode} {
34 set order "--date-order"
35 }
36 if {[catch {
37 set commfd [open [concat | git-rev-list --header $order \
68 - --parents --boundary $rlargs] r]
38 + --parents --boundary --default HEAD $args] r]
39 } err]} {
40 puts stderr "Error executing git-rev-list: $err"
41 exit 1
@@ -92,11 +62,11 @@ proc stop_rev_list {} {
62 unset commfd
63 }
64
95 -proc getcommits {rargs} {
65 +proc getcommits {} {
66 global phase canv mainfont
67
68 set phase getcommits
99 - start_rev_list $rargs
69 + start_rev_list
70 $canv delete all
71 $canv create text 3 3 -anchor nw -text "Reading commits..." \
72 -font $mainfont -tags textitems
@@ -239,7 +209,6 @@ proc updatecommits {} {
209 set n $curview
210 set curview -1
211 catch {unset viewdata($n)}
242 - parse_args $revtreeargs
212 readrefs
213 showview $n
214 }
@@ -926,7 +895,6 @@ proc showview {n} {
895 global numcommits rowrangelist commitlisted idrowranges
896 global selectedline currentid canv canvy0
897 global matchinglines treediffs
929 - global parsed_args
898 global pending_select phase
899 global commitidx rowlaidout rowoptim linesegends leftover
900 global commfd nextupdate
@@ -974,12 +942,8 @@ proc showview {n} {
942 .bar.view entryconf 2 -state [expr {$n == 0? "disabled": "normal"}]
943
944 if {![info exists viewdata($n)]} {
977 - set args $parsed_args
978 - if {$viewfiles($n) ne {}} {
979 - set args [concat $args "--" $viewfiles($n)]
980 - }
945 set pending_select $selid
982 - getcommits $args
946 + getcommits
947 return
948 }
949
@@ -4252,8 +4216,18 @@ set patchnum 0
4216 setcoords
4217 makewindow
4218 readrefs
4255 -parse_args $revtreeargs
4256 -set args $parsed_args
4219 +
4220 +set cmdline_files {}
4221 +catch {
4222 + set fileargs [eval exec git-rev-parse --no-revs --no-flags $revtreeargs]
4223 + set cmdline_files [split $fileargs "\n"]
4224 + set n [llength $cmdline_files]
4225 + set revtreeargs [lrange $revtreeargs 0 end-$n]
4226 +}
4227 +if {[lindex $revtreeargs end] eq "--"} {
4228 + set revtreeargs [lrange $revtreeargs 0 end-1]
4229 +}
4230 +
4231 if {$cmdline_files ne {}} {
4232 # create a view for the files/dirs specified on the command line
4233 set curview 1
@@ -4262,6 +4236,5 @@ if {$cmdline_files ne {}} {
4236 set viewfiles(1) $cmdline_files
4237 .bar.view add command -label $viewname(1) -command {showview 1}
4238 .bar.view entryconf 2 -state normal
4265 - set args [concat $args "--" $cmdline_files]
4239 }
4267 -getcommits $args
4240 +getcommits