summaryrefslogtreecommitdiff
path: root/windowMerge.go
diff options
context:
space:
mode:
Diffstat (limited to 'windowMerge.go')
-rw-r--r--windowMerge.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/windowMerge.go b/windowMerge.go
index a407995..5bfb737 100644
--- a/windowMerge.go
+++ b/windowMerge.go
@@ -103,6 +103,8 @@ func (rs *RepoStatus) MakeRepoMergeWindow(repo *gitpb.Repo) *repoMergeWindow {
grid.NextRow()
grid.NewButton("checkout user", func() {
+ w.Disable()
+ defer w.Enable()
if err := repo.CheckoutUser(); err != nil {
log.Info(repo.GetFullPath(), err)
}
@@ -111,11 +113,15 @@ func (rs *RepoStatus) MakeRepoMergeWindow(repo *gitpb.Repo) *repoMergeWindow {
})
grid.NextRow()
grid.NewButton("checkout devel", func() {
+ w.Disable()
+ defer w.Enable()
repo.CheckoutDevel()
w.repo.Reload()
w.Update()
})
w.mergeD = grid.NewButton("merge to devel", func() {
+ w.Disable()
+ defer w.Enable()
log.Info("repo:", repo.GetGoPath())
if result, err := repo.MergeToDevel(); err == nil {
log.Warn("THINGS SEEM OK", repo.GetFullPath())
@@ -140,11 +146,15 @@ func (rs *RepoStatus) MakeRepoMergeWindow(repo *gitpb.Repo) *repoMergeWindow {
})
grid.NextRow()
grid.NewButton("checkout master", func() {
+ w.Disable()
+ defer w.Enable()
repo.CheckoutMaster()
w.repo.Reload()
w.Update()
})
w.mergeM = grid.NewButton("merge to master", func() {
+ w.Disable()
+ defer w.Enable()
log.Info("repo:", repo.GetGoPath())
if result, err := repo.MergeToMaster(); err == nil {
log.Warn("THINGS SEEM OK", repo.GetFullPath())