summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--argv.go13
-rw-r--r--http.go6
2 files changed, 10 insertions, 9 deletions
diff --git a/argv.go b/argv.go
index 3a2d7dd..ae0366e 100644
--- a/argv.go
+++ b/argv.go
@@ -18,11 +18,12 @@ type args struct {
Gui *EmptyCmd `arg:"subcommand:gui" help:"show gui"`
Merge *EmptyCmd `arg:"subcommand:merge" help:"merge in new patchsets"`
Init *EmptyCmd `arg:"subcommand:init" help:"init the repo list"`
- Port int `arg:"--port" default:"2520" help:"port to run on"`
- Hostname string `arg:"--hostname" default:"forge.wit.com" help:"hostname to use"`
- Daemon bool `arg:"--daemon" help:"run as a daemon"`
- Force bool `arg:"--force" help:"try to strong arm things"`
- Verbose bool `arg:"--verbose" help:"show more output"`
+ Repos *EmptyCmd `arg:"subcommand:repos" help:"show the repos"`
+ Port int `arg:"--port" default:"2520" help:"port to run on"`
+ Hostname string `arg:"--hostname" help:"hostname to use"`
+ Daemon bool `arg:"--daemon" help:"run as a daemon"`
+ Force bool `arg:"--force" help:"try to strong arm things"`
+ Verbose bool `arg:"--verbose" help:"show more output"`
}
type EmptyCmd struct {
@@ -38,7 +39,7 @@ func (a args) DoAutoComplete(argv []string) {
case "merge":
fmt.Println("--force")
default:
- fmt.Println("list merge")
+ fmt.Println("list merge repos")
}
os.Exit(0)
}
diff --git a/http.go b/http.go
index 486cf13..c4d3c94 100644
--- a/http.go
+++ b/http.go
@@ -46,13 +46,13 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
switch route {
case "/repos/check":
result = addRequest(pb, reqPB)
- reqPB.Logf("repos check result.Len()=%d pb.Len()=%d\n", result.Len(), pb.Len())
+ reqPB.Logf("repos check result.Len()=%d pb.Len()=%d", result.Len(), pb.Len())
case "/repos/pull":
result = pullRequest(pb, reqPB)
case "/repos/add":
result = addRequest(pb, reqPB)
default:
- reqPB.Logf("repos check result.Len()=%d pb.Len()=%d\n", result.Len(), pb.Len())
+ reqPB.Logf("repos check result.Len()=%d pb.Len()=%d", result.Len(), pb.Len())
log.Info("repos", route, "unknown")
}
if err := result.SendReply(w, reqPB); err != nil {
@@ -74,7 +74,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
switch route {
case "/patches/new":
result = addNewPatches(pb, reqPB)
- reqPB.Logf("addNewPatches() pb.Len()=%d result.Len()=%d\n", pb.Len(), result.Len())
+ reqPB.Logf("addNewPatches() pb.Len()=%d result.Len()=%d", pb.Len(), result.Len())
case "/patches/applied":
reqPB.Log("not really anything needs to be done on applied patches?")
case "/patches/merged":