Don't delete branch twice (#55)

Author: cardil

internal/cmd/root.go

@@ -23,6 +23,9 @@ func (a App) Command() *cobra.Command {
 	}
 	cmd.SetOut(os.Stdout)
 	cmd.SetErr(os.Stderr)
+	cmd.PersistentPreRun = func(cmd *cobra.Command, _ []string) {
+		cmd.SilenceUsage = true
+	}
 	opts := &cli.Options{}
 	subs := []subcommand{
 		sync{opts},

internal/cmd/sync.go

@@ -15,10 +15,10 @@ type sync struct {
 
 func (s sync) command() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:       "sync",
+		Use:       "sync [project-dir]",
 		Short:     "Synchronize to the upstream releases",
 		ValidArgs: []string{"REPOSITORY"},
-		Args:      cobra.OnlyValidArgs,
+		Args:      cobra.MaximumNArgs(1),
 		RunE:      s.run,
 	}
 	return cmd
@@ -35,16 +35,16 @@ func (s sync) project(args []string) func() config.Project {
 		if err != nil {
 			wd = "/"
 		}
+		if len(args) > 0 {
+			wd = args[0]
+		}
 		if !path.IsAbs(configPath) {
 			configPath = path.Join(wd, configPath)
 		}
 		project := config.Project{
 			ConfigPath: configPath,
 			Path:       wd,
 		}
-		if len(args) > 0 {
-			project.Path = args[0]
-		}
 		return project
 	}
 }

pkg/sync/create_pr.go

@@ -101,7 +101,7 @@ func (c createPR) open() error {
 	cl := github.NewClient(args...)
 	cl.ProjectDir = c.Path
 	buff, err := cl.Execute(c.Context)
-	defer c.Println("Github client:", buff)
+	defer c.Println("Github client:", string(buff))
 	return errors.Wrap(err, ErrSyncFailed)
 }
 

pkg/sync/mirror_release.go

@@ -74,14 +74,16 @@ func (r createNewRelease) checkoutAsNewRelease(upstreamBranch, downstreamBranch
 
 type push struct {
 	state.State
-	branch string
+	branch     string
+	skipDelete bool
 }
 
 func (p push) steps() []step {
-	return []step{
-		p.push,
-		p.delete,
+	st := []step{p.push}
+	if !p.skipDelete {
+		st = append(st, p.delete)
 	}
+	return st
 }
 
 func (p push) push() error {

pkg/sync/resync_releases.go

@@ -88,7 +88,7 @@ func (r resyncRelease) run() error {
 				return nil
 			}
 			err = multiStep{
-				r.pushBranch(syncBranch),
+				r.pushBranch(syncBranch, skipDeleteOnPush),
 				r.createSyncReleasePR(downstreamBranch, upstreamBranch, syncBranch),
 			}.runSteps()
 			return

pkg/sync/sync_release_next.go

@@ -9,12 +9,21 @@ func (o Operation) syncReleaseNext() error {
 	})
 }
 
-func (o Operation) pushBranch(branch string) step {
+type pushOpt func(*push)
+
+func skipDeleteOnPush(p *push) {
+	p.skipDelete = true
+}
+
+func (o Operation) pushBranch(branch string, opts ...pushOpt) step {
 	return func() error {
 		p := push{
 			State:  o.State,
 			branch: branch,
 		}
+		for _, opt := range opts {
+			opt(&p)
+		}
 		return runSteps(p.steps())
 	}
 }