summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--argv.go2
-rw-r--r--doPatch.go2
-rw-r--r--main.go45
3 files changed, 19 insertions, 30 deletions
diff --git a/argv.go b/argv.go
index 9a15eda..0f9a4db 100644
--- a/argv.go
+++ b/argv.go
@@ -22,7 +22,7 @@ type args struct {
Config *ConfigCmd `arg:"subcommand:config" help:"show your .config/forge/ settings"`
Gui *EmptyCmd `arg:"subcommand:gui" help:"open the gui"`
Merge *MergeCmd `arg:"subcommand:merge" help:"merge branches"`
- Normal *NormalCmd `arg:"subcommand:user" help:"makes a user branch in every git repo"`
+ Normal *NormalCmd `arg:"subcommand:user" help:"makes a user branch in every git repo (The Default)"`
Patch *PatchCmd `arg:"subcommand:patch" help:"make patchsets"`
Pull *PullCmd `arg:"subcommand:pull" help:"run 'git pull'"`
Show *ShowCmd `arg:"subcommand:show" help:"print out things"`
diff --git a/doPatch.go b/doPatch.go
index 0db536e..50a3c5d 100644
--- a/doPatch.go
+++ b/doPatch.go
@@ -219,7 +219,7 @@ func showWorkRepos() bool {
log.Info("you currently have no repos with patches")
return false
} else {
- me.forge.PrintHumanTable(found)
+ me.forge.PrintDefaultTB(found)
}
return true
}
diff --git a/main.go b/main.go
index f5620b5..78da3fe 100644
--- a/main.go
+++ b/main.go
@@ -82,29 +82,12 @@ func main() {
badExit(err)
}
}
- okExit("")
- }
-
- /*
- if argv.Show.BuildForge {
+ if argv.Dev.BuildForge {
buildForge()
okExit("")
}
-
- if argv.Show.Build != "" {
- if err := doBuild(); err != nil {
- badExit(err)
- }
- okExit("")
- }
-
- if argv.Install != "" {
- if err := doInstall(); err != nil {
- badExit(err)
- }
- okExit("")
- }
- */
+ okExit("")
+ }
if argv.Clean != nil {
if err := doClean(); err != nil {
@@ -186,7 +169,7 @@ func main() {
if argv.All {
me.forge.PrintHumanTableFull(found)
} else {
- me.forge.PrintHumanTable(found)
+ me.forge.PrintDefaultTB(found)
}
okExit("")
}
@@ -209,14 +192,20 @@ func main() {
doGui() // start making our forge GUI
debug() // sits here forever
}
- // got to the end with nothing to do (?)
- if showWorkRepos() {
- // found some repos at least
+ if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL {
+ // got to the end with nothing to do (?)
+ if showWorkRepos() {
+ // found some repos at least
+ } else {
+ // every repo is in a really clean state. no extra files anywhere
+ // no dirty repos, no repos that need to be published
+ // nothing different between user and master branch version. not common
+ log.Info("All of your git repositories appear to be in perfect shape")
+ }
} else {
- // every repo is in a really clean state. no extra files anywhere
- // no dirty repos, no repos that need to be published
- // nothing different between user and master branch version. not common
- log.Info("All of your git repositories appear to be in perfect shape")
+ found := findAll()
+ me.forge.PrintDefaultTB(found)
+ okExit("")
}
okExit("")
}