Skip to content

Commit ca0b1d5

Browse files
committed
close #241 remove phlow spinner
1 parent b41b655 commit ca0b1d5

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

phlow/deliver.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ func DeliverCaller() {
3333
func Deliver(conf *setting.ProjectSetting) {
3434
git := githandler.Git{Run: executor.RunGit}
3535

36-
ui.PhlowSpinner.Start("delivering")
37-
defer ui.PhlowSpinner.Stop()
36+
fmt.Println("delivering...")
3837

3938
out, err := git.Branch("-a")
4039
branchInfo := githandler.AsList(out)
@@ -58,7 +57,6 @@ func Deliver(conf *setting.ProjectSetting) {
5857

5958
_, err = git.Branch("-m", branchInfo.Current, "delivered/"+branchInfo.Current)
6059
if err != nil {
61-
ui.PhlowSpinner.Stop()
6260
fmt.Println("The branch have been pushed successfully to your remote, but there is a local name conflict")
6361
fmt.Printf("CONFLICT: your already have a branch named %s in your workspace \n", "delivered/"+branchInfo.Current)
6462
fmt.Printf("to mark it delivered run: git branch -m %s %s \n", branchInfo.Current, "delivered/"+branchInfo.Current)
@@ -73,7 +71,6 @@ func Deliver(conf *setting.ProjectSetting) {
7371
return
7472
}
7573

76-
ui.PhlowSpinner.Stop()
7774
fmt.Printf("Delivered branch %s \n", ui.Format.Branch(branchInfo.Current))
7875
}
7976

@@ -99,8 +96,6 @@ func LocalDeliver(conf *setting.ProjectSetting) {
9996
}
10097

10198
//Pull rebase latest changes
102-
ui.PhlowSpinner.Start("delivering")
103-
defer ui.PhlowSpinner.Stop()
10499

105100
_, err = git.Pull("--rebase")
106101
if err != nil {
@@ -128,6 +123,6 @@ func LocalDeliver(conf *setting.ProjectSetting) {
128123
fmt.Println(err)
129124
return
130125
}
131-
ui.PhlowSpinner.Stop()
126+
132127
fmt.Printf("Delivered changes from %s to %s \n", ui.Format.Branch(branchInfo.Current), ui.Format.Branch(conf.IntegrationBranch))
133128
}

0 commit comments

Comments
 (0)