<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/4573c64033495730319db79718f4773095451948">https://github.com/macports/macports-base/commit/4573c64033495730319db79718f4773095451948</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4573c64 Clean up dead and redundant code related to action completion
</span>4573c64 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4573c64033495730319db79718f4773095451948
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jul 29 22:36:09 2017 +1000
<span style='display:block; white-space:pre;color:#404040;'> Clean up dead and redundant code related to action completion
</span>---
src/port/port.tcl | 41 +++--------------------------------------
1 file changed, 3 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index dab676d..a70c975 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4366,39 +4366,17 @@ array set action_array [list \
</span> ]
# Expand "action".
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Returns an action proc, or a list of matching action procs, or the action passed in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Returns a list of matching actions.
</span> proc find_action { action } {
global action_array
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ! [info exists action_array($action)] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set guess [guess_action $action]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists action_array($guess)] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return $guess
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return $guess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists action_array($action)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [array names action_array [string tolower $action]*]
</span> }
return $action
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Expand action
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# If there's more than one match, return the next possibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc find_action_proc { action } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global action_array
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set action_proc ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists action_array($action)] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set action_proc [lindex $action_array($action) 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set action [complete_action $action]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists action_array($action)] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set action_proc [lindex $action_array($action) 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return $action_proc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> proc get_action_proc { action } {
global action_array
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4830,19 +4808,6 @@ proc complete_action { text state } {
</span> return $word
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# return all actions beginning with $text
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc guess_action { text } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global action_array
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [array names action_array "[string tolower $text]*"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [llength $complete_choices ] == 1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [lindex $complete_choices 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> proc attempt_completion { text word start end } {
# If the word starts with '~', or contains '.' or '/', then use the build-in
# completion to complete the word
</pre><pre style='margin:0'>
</pre>