diff --git a/argv.go b/argv.go index 977e8fe..e05abf4 100644 --- a/argv.go +++ b/argv.go @@ -42,12 +42,12 @@ type ExamineCmd struct { } type CleanCmd struct { - User *EmptyCmd `arg:"subcommand:user" help:"clean the user branches"` - Devel *CleanDevelCmd `arg:"subcommand:devel" help:"clean and verify the devel branches"` - Force *EmptyCmd `arg:"subcommand:force" help:"try harder to delete things. check your patchsets have been saved first."` - Examine *ExamineCmd `arg:"subcommand:examine" help:"examine branches"` - GitReset *EmptyCmd `arg:"subcommand:git-reset" help:"git reset --hard"` Delete *EmptyCmd `arg:"subcommand:delete" help:"rescan repo"` + Devel *CleanDevelCmd `arg:"subcommand:devel" help:"clean and verify the devel branches"` + Examine *ExamineCmd `arg:"subcommand:examine" help:"examine branches"` + Force *EmptyCmd `arg:"subcommand:force" help:"do destructive stuff"` + GitReset *EmptyCmd `arg:"subcommand:git-reset" help:"git reset --hard"` + User *EmptyCmd `arg:"subcommand:user" help:"clean the user branches"` } type CleanDevelCmd struct { diff --git a/argvAutoshell.go b/argvAutoshell.go index 171f5f7..b97218f 100644 --- a/argvAutoshell.go +++ b/argvAutoshell.go @@ -29,10 +29,7 @@ func (args) doBashAuto() { // me.pp.WriteUsageForSubcommand(os.Stderr, me.pp.SubcommandNames()...) // me.pp.WriteHelpForSubcommand(os.Stderr, me.pp.SubcommandNames()...) me.pp.WriteHelpForSubcommand(os.Stderr, "clean") - fmt.Fprintln(os.Stderr, "") - fmt.Fprintln(os.Stderr, "hello world") - fmt.Fprintln(os.Stderr, "") - fmt.Println("devel user force clean examine git-reset") + fmt.Println("delete devel force examine force git-reset user") case "commit": fmt.Println("--all") case "config": diff --git a/find.go b/find.go index c230330..c81fa60 100644 --- a/find.go +++ b/find.go @@ -123,12 +123,16 @@ func findReposWithPatches() { all := me.forge.Repos.SortByFullPath() for all.Scan() { repo := all.Next() + if repo.GetUserVersion() == "" || repo.GetUserVersion() == "uerr" { + continue + } if repo.IsDirty() { me.found.AppendByGoPath(repo) continue } if repo.GetUserVersion() != repo.GetDevelVersion() { me.found.AppendByGoPath(repo) + continue } } }