From e019ff9f022ecc661aa96ce2fd4a1e7e7b46f1dd Mon Sep 17 00:00:00 2001 From: chemotaxis Date: Mon, 11 Apr 2022 01:38:42 -0400 Subject: [PATCH] Modify documentation if called from issue or pr --- pkg/cmd/issue/issue.go | 4 ++-- pkg/cmd/issue/lock/lock.go | 24 ++++++++++++------------ pkg/cmd/pr/pr.go | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/cmd/issue/issue.go b/pkg/cmd/issue/issue.go index a4c354e33..2fb51580d 100644 --- a/pkg/cmd/issue/issue.go +++ b/pkg/cmd/issue/issue.go @@ -42,10 +42,10 @@ func NewCmdIssue(f *cmdutil.Factory) *cobra.Command { cmd.AddCommand(cmdClose.NewCmdClose(f, nil)) cmd.AddCommand(cmdCreate.NewCmdCreate(f, nil)) cmd.AddCommand(cmdList.NewCmdList(f, nil)) - cmd.AddCommand(cmdLock.NewCmdLock(f, nil)) + cmd.AddCommand(cmdLock.NewCmdLock(f, cmd.Name())) cmd.AddCommand(cmdReopen.NewCmdReopen(f, nil)) cmd.AddCommand(cmdStatus.NewCmdStatus(f, nil)) - cmd.AddCommand(cmdLock.NewCmdUnlock(f, nil)) + cmd.AddCommand(cmdLock.NewCmdUnlock(f, cmd.Name())) cmd.AddCommand(cmdView.NewCmdView(f, nil)) cmd.AddCommand(cmdComment.NewCmdComment(f, nil)) cmd.AddCommand(cmdDelete.NewCmdDelete(f, nil)) diff --git a/pkg/cmd/issue/lock/lock.go b/pkg/cmd/issue/lock/lock.go index c830a343d..58e3bc026 100644 --- a/pkg/cmd/issue/lock/lock.go +++ b/pkg/cmd/issue/lock/lock.go @@ -98,15 +98,19 @@ func (opts *LockOptions) setCommonOptions(f *cmdutil.Factory, cmd *cobra.Command } -func NewCmdLock(f *cmdutil.Factory, runF func(*LockOptions) error) *cobra.Command { +func NewCmdLock(f *cmdutil.Factory, parentName string) *cobra.Command { opts := &LockOptions{ + ParentCmd: parentName, PadlockState: Lock, } + c := cmds[opts.ParentCmd] + short := fmt.Sprintf("Lock %s conversation", strings.ToLower(c.FullName)) + cmd := &cobra.Command{ Use: "lock { | }", - Short: "Lock a conversation", + Short: short, Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { @@ -123,11 +127,6 @@ func NewCmdLock(f *cmdutil.Factory, runF func(*LockOptions) error) *cobra.Comman } } - opts.setCommonOptions(f, cmd, args) - - if runF != nil { - return runF(opts) - } return padlock(opts) }, } @@ -138,23 +137,24 @@ func NewCmdLock(f *cmdutil.Factory, runF func(*LockOptions) error) *cobra.Comman return cmd } -func NewCmdUnlock(f *cmdutil.Factory, runF func(*LockOptions) error) *cobra.Command { +func NewCmdUnlock(f *cmdutil.Factory, parentName string) *cobra.Command { opts := &LockOptions{ + ParentCmd: parentName, PadlockState: Unlock, } + c := cmds[opts.ParentCmd] + short := fmt.Sprintf("Unlock %s conversation", strings.ToLower(c.FullName)) + cmd := &cobra.Command{ Use: "unlock { | }", - Short: "Unlock a conversation", + Short: short, Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { opts.setCommonOptions(f, cmd, args) - if runF != nil { - return runF(opts) - } return padlock(opts) }, } diff --git a/pkg/cmd/pr/pr.go b/pkg/cmd/pr/pr.go index 2e3005aff..d5265f405 100644 --- a/pkg/cmd/pr/pr.go +++ b/pkg/cmd/pr/pr.go @@ -49,13 +49,13 @@ func NewCmdPR(f *cmdutil.Factory) *cobra.Command { cmd.AddCommand(cmdCreate.NewCmdCreate(f, nil)) cmd.AddCommand(cmdDiff.NewCmdDiff(f, nil)) cmd.AddCommand(cmdList.NewCmdList(f, nil)) - cmd.AddCommand(cmdLock.NewCmdLock(f, nil)) + cmd.AddCommand(cmdLock.NewCmdLock(f, cmd.Name())) cmd.AddCommand(cmdMerge.NewCmdMerge(f, nil)) cmd.AddCommand(cmdReady.NewCmdReady(f, nil)) cmd.AddCommand(cmdReopen.NewCmdReopen(f, nil)) cmd.AddCommand(cmdReview.NewCmdReview(f, nil)) cmd.AddCommand(cmdStatus.NewCmdStatus(f, nil)) - cmd.AddCommand(cmdLock.NewCmdUnlock(f, nil)) + cmd.AddCommand(cmdLock.NewCmdUnlock(f, cmd.Name())) cmd.AddCommand(cmdView.NewCmdView(f, nil)) cmd.AddCommand(cmdChecks.NewCmdChecks(f, nil)) cmd.AddCommand(cmdComment.NewCmdComment(f, nil))