slowly working out autocomplete kinks

1 files changed, 5 insertions, 12 deletions

diff --git a/argv.go b/argv.go
index 35c3246..fcc5a91 100644
--- a/argv.go
+++ b/argv.go
@@ -164,7 +164,7 @@ func DoAutoComplete(autoArgv *prep.Auto) {
 	if dur < time.Millisecond*200 {
 		autoArgv.Debug = true
 		autoArgv.Debugf("TODO: show extended help here '%s' '%s' %v dur=%v\n", autoArgv.Arg0, autoArgv.Arg1, autoArgv.Argv, shell.FormatDuration(dur))
-		autoArgv.AutoDebug()
+		autoArgv.PrintDebug()
 		fmt.Println(" ")
 	}
 
@@ -177,7 +177,7 @@ func DoAutoComplete(autoArgv *prep.Auto) {
 			autoArgv.Debugf("user:   checkout the user branches on all repos")
 		}
 		// argv.Checkout.Autocomplete("devel master user")
-		autoArgv.Autocomplete(argv.Checkout, "devel master user")
+		autoArgv.Autocomplete2("devel master user")
 	case "clean":
 		// me.pp.WriteHelp(os.Stderr)
 		// me.pp.WriteUsageForSubcommand(os.Stderr, me.pp.SubcommandNames()...)
@@ -185,14 +185,7 @@ func DoAutoComplete(autoArgv *prep.Auto) {
 		// me.pp.WriteHelpForSubcommand(os.Stderr, "clean")
 		fmt.Println("--force verify --repo")
 	case "commit":
-		autoArgv.Debugf("WTF")
-		autoArgv.Autocomplete(argv.Commit, "--all")
-		if dur > time.Millisecond*200 {
-			if dur < time.Millisecond*800 {
-				// fmt.Println("a b")
-				fmt.Println("")
-			}
-		}
+		autoArgv.Autocomplete2("--all")
 	case "config":
 		fmt.Println("add fix list")
 	case "dirty":
@@ -210,7 +203,7 @@ func DoAutoComplete(autoArgv *prep.Auto) {
 	case "list":
 		fmt.Println("--mine --favorites --dirty")
 	case "merge":
-		fmt.Println("devel master")
+		autoArgv.Autocomplete2("devel master --all")
 	case "normal":
 		fmt.Println("on off")
 	case "pull":
@@ -231,7 +224,7 @@ func DoAutoComplete(autoArgv *prep.Auto) {
 		// if argv.ArgName == ARGNAME {
 		// }
 		// list the subcommands here
-		fmt.Println("help list checkout clean commit dirty fetch gui normal merge patch pull tag --gui")
+		autoArgv.Autocomplete2("help list checkout clean commit dirty fetch gui normal merge patch pull tag --gui")
 	}
 	os.Exit(0)
 }