undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  gitk: Let git-rev-list do the argument list parsing
This commit is contained in:
Junio C Hamano 2006-04-24 02:18:33 -07:00
commit 3fdce210ee
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gitk
View File

@ -16,22 +16,6 @@ proc gitdir {} {
} }
} }
proc parse_args {rargs} {
global parsed_args
if {[catch {
set parse_args [concat --default HEAD $rargs]
set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
}]} {
# if git-rev-parse failed for some reason...
if {$rargs == {}} {
set rargs HEAD
}
set parsed_args $rargs
}
return $parsed_args
}
proc start_rev_list {rlargs} { proc start_rev_list {rlargs} {
global startmsecs nextupdate ncmupdate global startmsecs nextupdate ncmupdate
global commfd leftover tclencoding datemode global commfd leftover tclencoding datemode
@ -46,7 +30,7 @@ proc start_rev_list {rlargs} {
} }
if {[catch { if {[catch {
set commfd [open [concat | git-rev-list --header $order \ set commfd [open [concat | git-rev-list --header $order \
--parents --boundary $rlargs] r] --parents --boundary --default HEAD $rlargs] r]
} err]} { } err]} {
puts stderr "Error executing git-rev-list: $err" puts stderr "Error executing git-rev-list: $err"
exit 1 exit 1
@ -65,7 +49,7 @@ proc getcommits {rargs} {
global phase canv mainfont global phase canv mainfont
set phase getcommits set phase getcommits
start_rev_list [parse_args $rargs] start_rev_list $rargs
$canv delete all $canv delete all
$canv create text 3 3 -anchor nw -text "Reading commits..." \ $canv create text 3 3 -anchor nw -text "Reading commits..." \
-font $mainfont -tags textitems -font $mainfont -tags textitems