Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove av-sync's behavior change warning #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aviator-app merged 1 commit into from
Mar 22, 2025
Merged

Remove av-sync's behavior change warning #543

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 16 additions & 122 deletions cmd/av/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

"emperror.dev/errors"
"github.com/aviator-co/av/internal/actions"
"github.com/aviator-co/av/internal/config"
"github.com/aviator-co/av/internal/gh"
"github.com/aviator-co/av/internal/gh/ghui"
"github.com/aviator-co/av/internal/git"
Expand Down Expand Up @@ -37,12 +36,6 @@ var syncFlags struct {
Prune string
}

const (
changeNoticePrompt = "Are you OK to continue with the new behavior?"
continueWithSyncChoice = "OK! Continue with av sync, rebasing onto the latest trunk (we will not ask again)"
abortSyncChoice = "Nope. Abort av sync (we will ask again next time)"
)

var syncCmd = &cobra.Command{
Use: "sync",
Short: "Synchronize stacked branches with GitHub",
Expand Down Expand Up @@ -101,11 +94,10 @@ base branch.
}

return uiutils.RunBubbleTea(&syncViewModel{
repo: repo,
db: db,
client: client,
help: help.New(),
askingSyncChange: !config.UserState.NotifiedStackSyncChange,
repo: repo,
db: db,
client: client,
help: help.New(),
})
},
}
Expand All @@ -129,31 +121,21 @@ type syncViewModel struct {

preAvSyncHookMessage string

state *syncState
changeNoticePrompt *selection.Model[string]
syncAllPrompt *selection.Model[string]
githubFetchModel *ghui.GitHubFetchModel
restackModel *sequencerui.RestackModel
githubPushModel *ghui.GitHubPushModel
pruneBranchModel *gitui.PruneBranchModel

askingSyncChange bool
pushingToGitHub bool
pruningBranches bool

quitWithAbortChoice bool
quitWithConflict bool
err error
state *syncState
syncAllPrompt *selection.Model[string]
githubFetchModel *ghui.GitHubFetchModel
restackModel *sequencerui.RestackModel
githubPushModel *ghui.GitHubPushModel
pruneBranchModel *gitui.PruneBranchModel

pushingToGitHub bool
pruningBranches bool

quitWithConflict bool
err error
}

func (vm *syncViewModel) Init() tea.Cmd {
if vm.askingSyncChange && os.Getenv("AV_STACK_SYNC_CHANGE_NO_ASK") != "1" {
vm.changeNoticePrompt = uiutils.NewPromptModel(
changeNoticePrompt,
[]string{continueWithSyncChoice, abortSyncChoice},
)
return vm.changeNoticePrompt.Init()
}
return vm.initSync()
}

Expand Down Expand Up @@ -262,33 +244,6 @@ func (vm *syncViewModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
_, cmd := vm.syncAllPrompt.Update(msg)
return vm, cmd
}
} else if vm.askingSyncChange {

switch msg.String() {
case " ", "enter":
c, err := vm.changeNoticePrompt.Value()
if err != nil {
vm.err = err
return vm, tea.Quit
}
vm.askingSyncChange = false
if c == continueWithSyncChoice {
config.UserState.NotifiedStackSyncChange = true
if err := config.SaveUserState(); err != nil {
vm.err = err
return vm, tea.Quit
}
return vm, vm.initSync()
} else {
vm.quitWithAbortChoice = true
return vm, tea.Quit
}
case "ctrl+c":
return vm, tea.Quit
default:
_, cmd := vm.changeNoticePrompt.Update(msg)
return vm, cmd
}
} else if vm.pushingToGitHub {
switch msg.String() {
case "ctrl+c":
Expand Down Expand Up @@ -327,9 +282,6 @@ func (vm *syncViewModel) View() string {
ss = append(ss, vm.syncAllPrompt.View())
ss = append(ss, vm.help.ShortHelpView(uiutils.PromptKeys))
}
if vm.changeNoticePrompt != nil {
ss = append(ss, vm.viewChangeNotice())
}
if vm.githubFetchModel != nil {
ss = append(ss, vm.githubFetchModel.View())
}
Expand Down Expand Up @@ -358,64 +310,6 @@ func (vm *syncViewModel) View() string {
return ret
}

var commandStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("5"))

func (vm *syncViewModel) viewChangeNotice() string {
boldStyle := lipgloss.NewStyle().Bold(true)
sb := strings.Builder{}
sb.WriteString(
boldStyle.Render(
"The behavior of ",
) + commandStyle.Bold(true).
Render("av sync") +
boldStyle.Render(
" has changed. We will now ask for confirmation before syncing the stack.\n",
),
)
sb.WriteString("\n")
sb.WriteString("* " + commandStyle.Render("av sync") + " is split into four commands:\n")
sb.WriteString(
" * " + commandStyle.Render("av adopt") + " to adopt a new branch into the stack.\n",
)
sb.WriteString(
" * " + commandStyle.Render("av reparent") + " to change the parent branch.\n",
)
sb.WriteString(
" * " + commandStyle.Render("av restack") + " to rebase the stack locally.\n",
)
sb.WriteString(
" * " + commandStyle.Render(
"av sync",
) + " to rebase the stack with the remote repository.\n",
)
sb.WriteString(
"* " + commandStyle.Render(
"av sync",
) + " will ask if you want to push to the remote repository.\n",
)
sb.WriteString(
"* " + commandStyle.Render(
"av sync",
) + " will ask if you want to delete the branches that have been merged.\n",
)
sb.WriteString("\n")
sb.WriteString(
"With this change, " + commandStyle.Render(
"av sync",
) + " will always rebase onto the remote trunk branch (e.g., main or\n",
)
sb.WriteString(
"master). If you do not want to rebase onto the remote trunk branch, please use " + commandStyle.Render(
"av restack",
) + ".\n",
)
sb.WriteString("\n")
sb.WriteString(vm.changeNoticePrompt.View())
sb.WriteString(vm.help.ShortHelpView(uiutils.PromptKeys))
sb.WriteString("\n")
return sb.String()
}

type preAvSyncHookDoneMsg struct {
}

Expand Down