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 |
|
46 | set parse_temp [eval exec {$env(HG)} 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 "| |
|
60 | set commfd [open "|{$env(HG)} 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 | |
@@ -179,7 +179,8 b' proc doupdate {reading} {' | |||||
179 | } |
|
179 | } | |
180 |
|
180 | |||
181 | proc readcommit {id} { |
|
181 | proc readcommit {id} { | |
182 | if [catch {set contents [exec hg debug-cat-file commit $id]}] return |
|
182 | global env | |
|
183 | if [catch {set contents [exec $env(HG) debug-cat-file commit $id]}] return | |||
183 | parsecommit $id $contents 0 {} |
|
184 | parsecommit $id $contents 0 {} | |
184 | } |
|
185 | } | |
185 |
|
186 | |||
@@ -258,9 +259,9 b' proc parsecommit {id contents listed old' | |||||
258 | } |
|
259 | } | |
259 |
|
260 | |||
260 | proc readrefs {} { |
|
261 | proc readrefs {} { | |
261 | global tagids idtags headids idheads tagcontents |
|
262 | global tagids idtags headids idheads tagcontents env | |
262 |
|
263 | |||
263 |
set tags [exec |
|
264 | set tags [exec $env(HG) tags] | |
264 | regsub -all "\r\n" $tags "\n" tags |
|
265 | regsub -all "\r\n" $tags "\n" tags | |
265 | set lines [split $tags "\n"] |
|
266 | set lines [split $tags "\n"] | |
266 | foreach f $lines { |
|
267 | foreach f $lines { | |
@@ -1713,6 +1714,7 b' proc findpatches {} {' | |||||
1713 | global findprocpid findprocfile |
|
1714 | global findprocpid findprocfile | |
1714 | global finddidsel ctext lineid findinprogress |
|
1715 | global finddidsel ctext lineid findinprogress | |
1715 | global findinsertpos |
|
1716 | global findinsertpos | |
|
1717 | global env | |||
1716 |
|
1718 | |||
1717 | if {$numcommits == 0} return |
|
1719 | if {$numcommits == 0} return | |
1718 |
|
1720 | |||
@@ -1732,7 +1734,7 b' proc findpatches {} {' | |||||
1732 | } |
|
1734 | } | |
1733 |
|
1735 | |||
1734 | if {[catch { |
|
1736 | if {[catch { | |
1735 |
set f [open [list | |
|
1737 | set f [open [list | $env(HG) debug-diff-tree --stdin -s -r -S$findstring \ | |
1736 | << $inputids] r] |
|
1738 | << $inputids] r] | |
1737 | } err]} { |
|
1739 | } err]} { | |
1738 | error_popup "Error starting search process: $err" |
|
1740 | error_popup "Error starting search process: $err" | |
@@ -1804,6 +1806,7 b' proc findfiles {} {' | |||||
1804 | global findinprogress findstartline findinsertpos |
|
1806 | global findinprogress findstartline findinsertpos | |
1805 | global treediffs fdiffids fdiffsneeded fdiffpos |
|
1807 | global treediffs fdiffids fdiffsneeded fdiffpos | |
1806 | global findmergefiles |
|
1808 | global findmergefiles | |
|
1809 | global env | |||
1807 |
|
1810 | |||
1808 | if {$numcommits == 0} return |
|
1811 | if {$numcommits == 0} return | |
1809 |
|
1812 | |||
@@ -1835,7 +1838,7 b' proc findfiles {} {' | |||||
1835 | # start off a git-diff-tree process if needed |
|
1838 | # start off a git-diff-tree process if needed | |
1836 | if {$diffsneeded ne {}} { |
|
1839 | if {$diffsneeded ne {}} { | |
1837 | if {[catch { |
|
1840 | if {[catch { | |
1838 |
set df [open [list | |
|
1841 | set df [open [list | $env(HG) debug-diff-tree -r --stdin << $diffsneeded] r] | |
1839 | } err ]} { |
|
1842 | } err ]} { | |
1840 | error_popup "Error starting search process: $err" |
|
1843 | error_popup "Error starting search process: $err" | |
1841 | return |
|
1844 | return | |
@@ -2252,13 +2255,14 b' proc mergediff {id} {' | |||||
2252 | } |
|
2255 | } | |
2253 |
|
2256 | |||
2254 | proc findgca {ids} { |
|
2257 | proc findgca {ids} { | |
|
2258 | global env | |||
2255 | set gca {} |
|
2259 | set gca {} | |
2256 | foreach id $ids { |
|
2260 | foreach id $ids { | |
2257 | if {$gca eq {}} { |
|
2261 | if {$gca eq {}} { | |
2258 | set gca $id |
|
2262 | set gca $id | |
2259 | } else { |
|
2263 | } else { | |
2260 | if {[catch { |
|
2264 | if {[catch { | |
2261 |
set gca [exec |
|
2265 | set gca [exec $env(HG) debug-merge-base $gca $id] | |
2262 | } err]} { |
|
2266 | } err]} { | |
2263 | return {} |
|
2267 | return {} | |
2264 | } |
|
2268 | } | |
@@ -2332,6 +2336,7 b' proc showmergediff {} {' | |||||
2332 | global cflist diffmergeid mergefilelist parents |
|
2336 | global cflist diffmergeid mergefilelist parents | |
2333 | global diffopts diffinhunk currentfile currenthunk filelines |
|
2337 | global diffopts diffinhunk currentfile currenthunk filelines | |
2334 | global diffblocked groupfilelast mergefds groupfilenum grouphunks |
|
2338 | global diffblocked groupfilelast mergefds groupfilenum grouphunks | |
|
2339 | global env | |||
2335 |
|
2340 | |||
2336 | set files $mergefilelist($diffmergeid) |
|
2341 | set files $mergefilelist($diffmergeid) | |
2337 | foreach f $files { |
|
2342 | foreach f $files { | |
@@ -2346,7 +2351,7 b' proc showmergediff {} {' | |||||
2346 | catch {unset grouphunks} |
|
2351 | catch {unset grouphunks} | |
2347 | set groupfilelast -1 |
|
2352 | set groupfilelast -1 | |
2348 | foreach p $parents($diffmergeid) { |
|
2353 | foreach p $parents($diffmergeid) { | |
2349 |
set cmd [list | |
|
2354 | set cmd [list | $env(HG) debug-diff-tree -p $p $diffmergeid] | |
2350 | set cmd [concat $cmd $mergefilelist($diffmergeid)] |
|
2355 | set cmd [concat $cmd $mergefilelist($diffmergeid)] | |
2351 | if {[catch {set f [open $cmd r]} err]} { |
|
2356 | if {[catch {set f [open $cmd r]} err]} { | |
2352 | error_popup "Error getting diffs: $err" |
|
2357 | error_popup "Error getting diffs: $err" | |
@@ -2785,12 +2790,12 b' proc addtocflist {ids} {' | |||||
2785 | } |
|
2790 | } | |
2786 |
|
2791 | |||
2787 | proc gettreediffs {ids} { |
|
2792 | proc gettreediffs {ids} { | |
2788 | global treediff parents treepending |
|
2793 | global treediff parents treepending env | |
2789 | set treepending $ids |
|
2794 | set treepending $ids | |
2790 | set treediff {} |
|
2795 | set treediff {} | |
2791 | set id [lindex $ids 0] |
|
2796 | set id [lindex $ids 0] | |
2792 | set p [lindex $ids 1] |
|
2797 | set p [lindex $ids 1] | |
2793 |
if [catch {set gdtf [open "| |
|
2798 | if [catch {set gdtf [open "|{$env(HG)} debug-diff-tree -r $p $id" r]}] return | |
2794 | fconfigure $gdtf -blocking 0 |
|
2799 | fconfigure $gdtf -blocking 0 | |
2795 | fileevent $gdtf readable [list gettreediffline $gdtf $ids] |
|
2800 | fileevent $gdtf readable [list gettreediffline $gdtf $ids] | |
2796 | } |
|
2801 | } | |
@@ -2826,7 +2831,7 b' proc getblobdiffs {ids} {' | |||||
2826 | set id [lindex $ids 0] |
|
2831 | set id [lindex $ids 0] | |
2827 | set p [lindex $ids 1] |
|
2832 | set p [lindex $ids 1] | |
2828 | set env(GIT_DIFF_OPTS) $diffopts |
|
2833 | set env(GIT_DIFF_OPTS) $diffopts | |
2829 |
set cmd [list | |
|
2834 | set cmd [list | $env(HG) debug-diff-tree -r -p -C $p $id] | |
2830 | if {[catch {set bdf [open $cmd r]} err]} { |
|
2835 | if {[catch {set bdf [open $cmd r]} err]} { | |
2831 | puts "error getting diffs: $err" |
|
2836 | puts "error getting diffs: $err" | |
2832 | return |
|
2837 | return | |
@@ -3409,12 +3414,12 b' proc mkpatchrev {} {' | |||||
3409 | } |
|
3414 | } | |
3410 |
|
3415 | |||
3411 | proc mkpatchgo {} { |
|
3416 | proc mkpatchgo {} { | |
3412 | global patchtop |
|
3417 | global patchtop env | |
3413 |
|
3418 | |||
3414 | set oldid [$patchtop.fromsha1 get] |
|
3419 | set oldid [$patchtop.fromsha1 get] | |
3415 | set newid [$patchtop.tosha1 get] |
|
3420 | set newid [$patchtop.tosha1 get] | |
3416 | set fname [$patchtop.fname get] |
|
3421 | set fname [$patchtop.fname get] | |
3417 |
if {[catch {exec |
|
3422 | if {[catch {exec $env(HG) debug-diff-tree -p $oldid $newid >$fname &} err]} { | |
3418 | error_popup "Error creating patch: $err" |
|
3423 | error_popup "Error creating patch: $err" | |
3419 | } |
|
3424 | } | |
3420 | catch {destroy $patchtop} |
|
3425 | catch {destroy $patchtop} | |
@@ -3473,7 +3478,7 b' proc domktag {} {' | |||||
3473 | return |
|
3478 | return | |
3474 | } |
|
3479 | } | |
3475 | if {[catch { |
|
3480 | if {[catch { | |
3476 |
set out [exec |
|
3481 | set out [exec $env(HG) tag -r $id $tag] | |
3477 | } err]} { |
|
3482 | } err]} { | |
3478 | error_popup "Error creating tag: $err" |
|
3483 | error_popup "Error creating tag: $err" | |
3479 | return |
|
3484 | return | |
@@ -3635,7 +3640,7 b' proc doquit {} {' | |||||
3635 | set datemode 0 |
|
3640 | set datemode 0 | |
3636 | set boldnames 0 |
|
3641 | set boldnames 0 | |
3637 | set diffopts "-U 5 -p" |
|
3642 | set diffopts "-U 5 -p" | |
3638 |
set wrcomcmd " |
|
3643 | set wrcomcmd "\"\$HG\" debug-diff-tree --stdin -p --pretty" | |
3639 |
|
3644 | |||
3640 | set mainfont {Helvetica 9} |
|
3645 | set mainfont {Helvetica 9} | |
3641 | set textfont {Courier 9} |
|
3646 | set textfont {Courier 9} |
@@ -272,7 +272,7 b' def view(ui, repo, *etc, **opts):' | |||||
272 | optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v]) |
|
272 | optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v]) | |
273 | cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc)) |
|
273 | cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc)) | |
274 | ui.debug("running %s\n" % cmd) |
|
274 | ui.debug("running %s\n" % cmd) | |
275 |
|
|
275 | util.system(cmd) | |
276 |
|
276 | |||
277 | cmdtable = { |
|
277 | cmdtable = { | |
278 | "^view": (view, |
|
278 | "^view": (view, |
General Comments 0
You need to be logged in to leave comments.
Login now