Show More
@@ -43,7 +43,7 b' proc getcommits {rargs} {' | |||||
43 | } |
|
43 | } | |
44 | if [catch { |
|
44 | if [catch { | |
45 | set parse_args [concat --default HEAD $revargs] |
|
45 | set parse_args [concat --default HEAD $revargs] | |
46 | set parse_temp [eval exec {$env(HG)} debug-rev-parse $parse_args] |
|
46 | set parse_temp [eval exec {$env(HG)} --config ui.report_untrusted=false debug-rev-parse $parse_args] | |
47 | regsub -all "\r\n" $parse_temp "\n" parse_temp |
|
47 | regsub -all "\r\n" $parse_temp "\n" parse_temp | |
48 | set parsed_args [split $parse_temp "\n"] |
|
48 | set parsed_args [split $parse_temp "\n"] | |
49 | } err] { |
|
49 | } err] { | |
@@ -57,7 +57,7 b' proc getcommits {rargs} {' | |||||
57 | set parsed_args [concat -n $limit $parsed_args] |
|
57 | set parsed_args [concat -n $limit $parsed_args] | |
58 | } |
|
58 | } | |
59 | if [catch { |
|
59 | if [catch { | |
60 | set commfd [open "|{$env(HG)} debug-rev-list --header --topo-order --parents $parsed_args" r] |
|
60 | set commfd [open "|{$env(HG)} --config ui.report_untrusted=false debug-rev-list --header --topo-order --parents $parsed_args" r] | |
61 | } err] { |
|
61 | } err] { | |
62 | puts stderr "Error executing hg debug-rev-list: $err" |
|
62 | puts stderr "Error executing hg debug-rev-list: $err" | |
63 | exit 1 |
|
63 | exit 1 | |
@@ -180,7 +180,7 b' proc doupdate {reading} {' | |||||
180 |
|
180 | |||
181 | proc readcommit {id} { |
|
181 | proc readcommit {id} { | |
182 | global env |
|
182 | global env | |
183 | if [catch {set contents [exec $env(HG) debug-cat-file commit $id]}] return |
|
183 | if [catch {set contents [exec $env(HG) --config ui.report_untrusted=false debug-cat-file commit $id]}] return | |
184 | parsecommit $id $contents 0 {} |
|
184 | parsecommit $id $contents 0 {} | |
185 | } |
|
185 | } | |
186 |
|
186 | |||
@@ -261,7 +261,7 b' proc parsecommit {id contents listed old' | |||||
261 | proc readrefs {} { |
|
261 | proc readrefs {} { | |
262 | global tagids idtags headids idheads tagcontents env |
|
262 | global tagids idtags headids idheads tagcontents env | |
263 |
|
263 | |||
264 | set tags [exec $env(HG) tags] |
|
264 | set tags [exec $env(HG) --config ui.report_untrusted=false tags] | |
265 | regsub -all "\r\n" $tags "\n" tags |
|
265 | regsub -all "\r\n" $tags "\n" tags | |
266 | set lines [split $tags "\n"] |
|
266 | set lines [split $tags "\n"] | |
267 | foreach f $lines { |
|
267 | foreach f $lines { | |
@@ -1734,8 +1734,7 b' proc findpatches {} {' | |||||
1734 | } |
|
1734 | } | |
1735 |
|
1735 | |||
1736 | if {[catch { |
|
1736 | if {[catch { | |
1737 |
set f [open [list | $env(HG) debug-diff-tree --stdin -s -r -S$findstring |
|
1737 | set f [open [list | $env(HG) --config ui.report_untrusted=false debug-diff-tree --stdin -s -r -S$findstring << $inputids] r] | |
1738 | << $inputids] r] |
|
|||
1739 | } err]} { |
|
1738 | } err]} { | |
1740 | error_popup "Error starting search process: $err" |
|
1739 | error_popup "Error starting search process: $err" | |
1741 | return |
|
1740 | return | |
@@ -1838,7 +1837,7 b' proc findfiles {} {' | |||||
1838 | # start off a git-diff-tree process if needed |
|
1837 | # start off a git-diff-tree process if needed | |
1839 | if {$diffsneeded ne {}} { |
|
1838 | if {$diffsneeded ne {}} { | |
1840 | if {[catch { |
|
1839 | if {[catch { | |
1841 | set df [open [list | $env(HG) debug-diff-tree -r --stdin << $diffsneeded] r] |
|
1840 | set df [open [list | $env(HG) --config ui.report_untrusted=false debug-diff-tree -r --stdin << $diffsneeded] r] | |
1842 | } err ]} { |
|
1841 | } err ]} { | |
1843 | error_popup "Error starting search process: $err" |
|
1842 | error_popup "Error starting search process: $err" | |
1844 | return |
|
1843 | return | |
@@ -2262,7 +2261,7 b' proc findgca {ids} {' | |||||
2262 | set gca $id |
|
2261 | set gca $id | |
2263 | } else { |
|
2262 | } else { | |
2264 | if {[catch { |
|
2263 | if {[catch { | |
2265 | set gca [exec $env(HG) debug-merge-base $gca $id] |
|
2264 | set gca [exec $env(HG) --config ui.report_untrusted=false debug-merge-base $gca $id] | |
2266 | } err]} { |
|
2265 | } err]} { | |
2267 | return {} |
|
2266 | return {} | |
2268 | } |
|
2267 | } | |
@@ -2351,7 +2350,7 b' proc showmergediff {} {' | |||||
2351 | catch {unset grouphunks} |
|
2350 | catch {unset grouphunks} | |
2352 | set groupfilelast -1 |
|
2351 | set groupfilelast -1 | |
2353 | foreach p $parents($diffmergeid) { |
|
2352 | foreach p $parents($diffmergeid) { | |
2354 | set cmd [list | $env(HG) debug-diff-tree -p $p $diffmergeid] |
|
2353 | set cmd [list | $env(HG) --config ui.report_untrusted=false debug-diff-tree -p $p $diffmergeid] | |
2355 | set cmd [concat $cmd $mergefilelist($diffmergeid)] |
|
2354 | set cmd [concat $cmd $mergefilelist($diffmergeid)] | |
2356 | if {[catch {set f [open $cmd r]} err]} { |
|
2355 | if {[catch {set f [open $cmd r]} err]} { | |
2357 | error_popup "Error getting diffs: $err" |
|
2356 | error_popup "Error getting diffs: $err" | |
@@ -2795,7 +2794,7 b' proc gettreediffs {ids} {' | |||||
2795 | set treediff {} |
|
2794 | set treediff {} | |
2796 | set id [lindex $ids 0] |
|
2795 | set id [lindex $ids 0] | |
2797 | set p [lindex $ids 1] |
|
2796 | set p [lindex $ids 1] | |
2798 | if [catch {set gdtf [open "|{$env(HG)} debug-diff-tree -r $p $id" r]}] return |
|
2797 | if [catch {set gdtf [open "|{$env(HG)} --config ui.report_untrusted=false debug-diff-tree -r $p $id" r]}] return | |
2799 | fconfigure $gdtf -blocking 0 |
|
2798 | fconfigure $gdtf -blocking 0 | |
2800 | fileevent $gdtf readable [list gettreediffline $gdtf $ids] |
|
2799 | fileevent $gdtf readable [list gettreediffline $gdtf $ids] | |
2801 | } |
|
2800 | } | |
@@ -2831,7 +2830,7 b' proc getblobdiffs {ids} {' | |||||
2831 | set id [lindex $ids 0] |
|
2830 | set id [lindex $ids 0] | |
2832 | set p [lindex $ids 1] |
|
2831 | set p [lindex $ids 1] | |
2833 | set env(GIT_DIFF_OPTS) $diffopts |
|
2832 | set env(GIT_DIFF_OPTS) $diffopts | |
2834 | set cmd [list | $env(HG) debug-diff-tree -r -p -C $p $id] |
|
2833 | set cmd [list | $env(HG) --config ui.report_untrusted=false debug-diff-tree -r -p -C $p $id] | |
2835 | if {[catch {set bdf [open $cmd r]} err]} { |
|
2834 | if {[catch {set bdf [open $cmd r]} err]} { | |
2836 | puts "error getting diffs: $err" |
|
2835 | puts "error getting diffs: $err" | |
2837 | return |
|
2836 | return | |
@@ -3419,7 +3418,7 b' proc mkpatchgo {} {' | |||||
3419 | set oldid [$patchtop.fromsha1 get] |
|
3418 | set oldid [$patchtop.fromsha1 get] | |
3420 | set newid [$patchtop.tosha1 get] |
|
3419 | set newid [$patchtop.tosha1 get] | |
3421 | set fname [$patchtop.fname get] |
|
3420 | set fname [$patchtop.fname get] | |
3422 | if {[catch {exec $env(HG) debug-diff-tree -p $oldid $newid >$fname &} err]} { |
|
3421 | if {[catch {exec $env(HG) --config ui.report_untrusted=false debug-diff-tree -p $oldid $newid >$fname &} err]} { | |
3423 | error_popup "Error creating patch: $err" |
|
3422 | error_popup "Error creating patch: $err" | |
3424 | } |
|
3423 | } | |
3425 | catch {destroy $patchtop} |
|
3424 | catch {destroy $patchtop} | |
@@ -3478,7 +3477,7 b' proc domktag {} {' | |||||
3478 | return |
|
3477 | return | |
3479 | } |
|
3478 | } | |
3480 | if {[catch { |
|
3479 | if {[catch { | |
3481 | set out [exec $env(HG) tag -r $id $tag] |
|
3480 | set out [exec $env(HG) --config ui.report_untrusted=false tag -r $id $tag] | |
3482 | } err]} { |
|
3481 | } err]} { | |
3483 | error_popup "Error creating tag: $err" |
|
3482 | error_popup "Error creating tag: $err" | |
3484 | return |
|
3483 | return | |
@@ -3640,7 +3639,7 b' proc doquit {} {' | |||||
3640 | set datemode 0 |
|
3639 | set datemode 0 | |
3641 | set boldnames 0 |
|
3640 | set boldnames 0 | |
3642 | set diffopts "-U 5 -p" |
|
3641 | set diffopts "-U 5 -p" | |
3643 | set wrcomcmd "\"\$HG\" debug-diff-tree --stdin -p --pretty" |
|
3642 | set wrcomcmd "\"\$HG\" --config ui.report_untrusted=false debug-diff-tree --stdin -p --pretty" | |
3644 |
|
3643 | |||
3645 | set mainfont {Helvetica 9} |
|
3644 | set mainfont {Helvetica 9} | |
3646 | set textfont {Courier 9} |
|
3645 | set textfont {Courier 9} |
General Comments 0
You need to be logged in to leave comments.
Login now