kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

[PATCH] gitk: Replace "git-" commands with "git " 

git-* commands work only if gitexecdir is in PATH.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
maint
Timo Hirvonen 19 years ago committed by Paul Mackerras
parent
f1b8629453
commit
8974c6f93e
1 changed files with 26 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      gitk

52
gitk
Unescape View File

@ -34,10 +34,10 @@ proc start_rev_list {view} {
set order "--date-order" set order "--date-order"
} }
if {[catch { if {[catch {
set fd [open [concat | git-rev-list --header $order \ set fd [open [concat | git rev-list --header $order \
--parents --boundary --default HEAD $args] r] --parents --boundary --default HEAD $args] r]
} err]} { } err]} {
puts stderr "Error executing git-rev-list: $err" puts stderr "Error executing git rev-list: $err"
exit 1 exit 1
} }
set commfd($view) $fd set commfd($view) $fd
@ -94,10 +94,10 @@ proc getcommitlines {fd view} {
} }
if {[string range $err 0 4] == "usage"} { if {[string range $err 0 4] == "usage"} {
set err "Gitk: error reading commits$fv:\ set err "Gitk: error reading commits$fv:\
bad arguments to git-rev-list." bad arguments to git rev-list."
if {$viewname($view) eq "Command line"} { if {$viewname($view) eq "Command line"} {
append err \ append err \
" (Note: arguments to gitk are passed to git-rev-list\ " (Note: arguments to gitk are passed to git rev-list\
to allow selection of commits to be displayed.)" to allow selection of commits to be displayed.)"
} }
} else { } else {
@ -148,7 +148,7 @@ proc getcommitlines {fd view} {
if {[string length $shortcmit] > 80} { if {[string length $shortcmit] > 80} {
set shortcmit "[string range $shortcmit 0 80]..." set shortcmit "[string range $shortcmit 0 80]..."
} }
error_popup "Can't parse git-rev-list output: {$shortcmit}" error_popup "Can't parse git rev-list output: {$shortcmit}"
exit 1 exit 1
} }
set id [lindex $ids 0] set id [lindex $ids 0]
@ -217,7 +217,7 @@ proc doupdate {} {
} }


proc readcommit {id} { proc readcommit {id} {
if {[catch {set contents [exec git-cat-file commit $id]}]} return if {[catch {set contents [exec git cat-file commit $id]}]} return
parsecommit $id $contents 0 parsecommit $id $contents 0
} }


@ -276,8 +276,8 @@ proc parsecommit {id contents listed} {
set headline $comment set headline $comment
} }
if {!$listed} { if {!$listed} {
# git-rev-list indents the comment by 4 spaces; # git rev-list indents the comment by 4 spaces;
# if we got this via git-cat-file, add the indentation # if we got this via git cat-file, add the indentation
set newcomment {} set newcomment {}
foreach line [split $comment "\n"] { foreach line [split $comment "\n"] {
append newcomment " " append newcomment " "
@ -337,14 +337,14 @@ proc readrefs {} {
set type {} set type {}
set tag {} set tag {}
catch { catch {
set commit [exec git-rev-parse "$id^0"] set commit [exec git rev-parse "$id^0"]
if {"$commit" != "$id"} { if {"$commit" != "$id"} {
set tagids($name) $commit set tagids($name) $commit
lappend idtags($commit) $name lappend idtags($commit) $name
} }
} }
catch { catch {
set tagcontents($name) [exec git-cat-file tag "$id"] set tagcontents($name) [exec git cat-file tag "$id"]
} }
} elseif { $type == "heads" } { } elseif { $type == "heads" } {
set headids($name) $id set headids($name) $id
@ -1287,7 +1287,7 @@ proc vieweditor {top n title} {
checkbutton $top.perm -text "Remember this view" -variable newviewperm($n) checkbutton $top.perm -text "Remember this view" -variable newviewperm($n)
grid $top.perm - -pady 5 -sticky w grid $top.perm - -pady 5 -sticky w
message $top.al -aspect 1000 -font $uifont \ message $top.al -aspect 1000 -font $uifont \
-text "Commits to include (arguments to git-rev-list):" -text "Commits to include (arguments to git rev-list):"
grid $top.al - -sticky w -pady 5 grid $top.al - -sticky w -pady 5
entry $top.args -width 50 -textvariable newviewargs($n) \ entry $top.args -width 50 -textvariable newviewargs($n) \
-background white -background white
@ -2941,7 +2941,7 @@ proc findpatches {} {
} }


if {[catch { if {[catch {
set f [open [list | git-diff-tree --stdin -s -r -S$findstring \ set f [open [list | git diff-tree --stdin -s -r -S$findstring \
<< $inputids] r] << $inputids] r]
} err]} { } err]} {
error_popup "Error starting search process: $err" error_popup "Error starting search process: $err"
@ -2973,7 +2973,7 @@ proc readfindproc {} {
return return
} }
if {![regexp {^[0-9a-f]{40}} $line id]} { if {![regexp {^[0-9a-f]{40}} $line id]} {
error_popup "Can't parse git-diff-tree output: $line" error_popup "Can't parse git diff-tree output: $line"
stopfindproc stopfindproc
return return
} }
@ -3038,10 +3038,10 @@ proc findfiles {} {
if {$l == $findstartline} break if {$l == $findstartline} break
} }


# start off a git-diff-tree process if needed # start off a git diff-tree process if needed
if {$diffsneeded ne {}} { if {$diffsneeded ne {}} {
if {[catch { if {[catch {
set df [open [list | git-diff-tree -r --stdin << $diffsneeded] r] set df [open [list | git diff-tree -r --stdin << $diffsneeded] r]
} err ]} { } err ]} {
error_popup "Error starting search process: $err" error_popup "Error starting search process: $err"
return return
@ -3071,7 +3071,7 @@ proc readfilediffs {df} {
if {[catch {close $df} err]} { if {[catch {close $df} err]} {
stopfindproc stopfindproc
bell bell
error_popup "Error in git-diff-tree: $err" error_popup "Error in git diff-tree: $err"
} elseif {[info exists findid]} { } elseif {[info exists findid]} {
set id $findid set id $findid
stopfindproc stopfindproc
@ -3098,7 +3098,7 @@ proc donefilediff {} {
if {[info exists fdiffid]} { if {[info exists fdiffid]} {
while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffid while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffid
&& $fdiffpos < [llength $fdiffsneeded]} { && $fdiffpos < [llength $fdiffsneeded]} {
# git-diff-tree doesn't output anything for a commit # git diff-tree doesn't output anything for a commit
# which doesn't change anything # which doesn't change anything
set nullid [lindex $fdiffsneeded $fdiffpos] set nullid [lindex $fdiffsneeded $fdiffpos]
set treediffs($nullid) {} set treediffs($nullid) {}
@ -3526,7 +3526,7 @@ proc gettree {id} {
catch {unset diffmergeid} catch {unset diffmergeid}
if {![info exists treefilelist($id)]} { if {![info exists treefilelist($id)]} {
if {![info exists treepending]} { if {![info exists treepending]} {
if {[catch {set gtf [open [concat | git-ls-tree -r $id] r]}]} { if {[catch {set gtf [open [concat | git ls-tree -r $id] r]}]} {
return return
} }
set treepending $id set treepending $id
@ -3574,7 +3574,7 @@ proc showfile {f} {
return return
} }
set blob [lindex $treeidlist($diffids) $i] set blob [lindex $treeidlist($diffids) $i]
if {[catch {set bf [open [concat | git-cat-file blob $blob] r]} err]} { if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
puts "oops, error reading blob $blob: $err" puts "oops, error reading blob $blob: $err"
return return
} }
@ -3616,7 +3616,7 @@ proc mergediff {id l} {
set diffids $id set diffids $id
# this doesn't seem to actually affect anything... # this doesn't seem to actually affect anything...
set env(GIT_DIFF_OPTS) $diffopts set env(GIT_DIFF_OPTS) $diffopts
set cmd [concat | git-diff-tree --no-commit-id --cc $id] set cmd [concat | git diff-tree --no-commit-id --cc $id]
if {[catch {set mdf [open $cmd r]} err]} { if {[catch {set mdf [open $cmd r]} err]} {
error_popup "Error getting merge diffs: $err" error_popup "Error getting merge diffs: $err"
return return
@ -3728,7 +3728,7 @@ proc gettreediffs {ids} {
set treepending $ids set treepending $ids
set treediff {} set treediff {}
if {[catch \ if {[catch \
{set gdtf [open [concat | git-diff-tree --no-commit-id -r $ids] r]} \ {set gdtf [open [concat | git diff-tree --no-commit-id -r $ids] r]} \
]} return ]} return
fconfigure $gdtf -blocking 0 fconfigure $gdtf -blocking 0
fileevent $gdtf readable [list gettreediffline $gdtf $ids] fileevent $gdtf readable [list gettreediffline $gdtf $ids]
@ -3764,7 +3764,7 @@ proc getblobdiffs {ids} {
global nextupdate diffinhdr treediffs global nextupdate diffinhdr treediffs


set env(GIT_DIFF_OPTS) $diffopts set env(GIT_DIFF_OPTS) $diffopts
set cmd [concat | git-diff-tree --no-commit-id -r -p -C $ids] set cmd [concat | git diff-tree --no-commit-id -r -p -C $ids]
if {[catch {set bdf [open $cmd r]} err]} { if {[catch {set bdf [open $cmd r]} err]} {
puts "error getting diffs: $err" puts "error getting diffs: $err"
return return
@ -4301,7 +4301,7 @@ proc mkpatchgo {} {
set oldid [$patchtop.fromsha1 get] set oldid [$patchtop.fromsha1 get]
set newid [$patchtop.tosha1 get] set newid [$patchtop.tosha1 get]
set fname [$patchtop.fname get] set fname [$patchtop.fname get]
if {[catch {exec git-diff-tree -p $oldid $newid >$fname &} err]} { if {[catch {exec git diff-tree -p $oldid $newid >$fname &} err]} {
error_popup "Error creating patch: $err" error_popup "Error creating patch: $err"
} }
catch {destroy $patchtop} catch {destroy $patchtop}
@ -4868,11 +4868,11 @@ proc tcl_encoding {enc} {
# defaults... # defaults...
set datemode 0 set datemode 0
set diffopts "-U 5 -p" set diffopts "-U 5 -p"
set wrcomcmd "git-diff-tree --stdin -p --pretty" set wrcomcmd "git diff-tree --stdin -p --pretty"


set gitencoding {} set gitencoding {}
catch { catch {
set gitencoding [exec git-repo-config --get i18n.commitencoding] set gitencoding [exec git repo-config --get i18n.commitencoding]
} }
if {$gitencoding == ""} { if {$gitencoding == ""} {
set gitencoding "utf-8" set gitencoding "utf-8"
@ -4928,7 +4928,7 @@ if {$i >= 0} {
set revtreeargs [lrange $revtreeargs 0 [expr {$i - 1}]] set revtreeargs [lrange $revtreeargs 0 [expr {$i - 1}]]
} elseif {$revtreeargs ne {}} { } elseif {$revtreeargs ne {}} {
if {[catch { if {[catch {
set f [eval exec git-rev-parse --no-revs --no-flags $revtreeargs] set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
set cmdline_files [split $f "\n"] set cmdline_files [split $f "\n"]
set n [llength $cmdline_files] set n [llength $cmdline_files]
set revtreeargs [lrange $revtreeargs 0 end-$n] set revtreeargs [lrange $revtreeargs 0 end-$n]

Write Preview
Loading…
Cancel
Save