More stuff

branches_panel.go

@@ -24,6 +24,19 @@ func handleForceCheckout(g *gocui.Gui, v *gocui.View) error {
   }, nil)
 }
 
+func handleNewBranch(g *gocui.Gui, v *gocui.View) error {
+  branch := state.Branches[0]
+  createPromptPanel(g, v, "New Branch Name (Branch is off of "+branch.Name+")", func(g *gocui.Gui, v *gocui.View) error {
+    // TODO: make sure the buffer is stripped of whitespace
+    if output, err := gitNewBranch(v.Buffer()); err != nil {
+      return createSimpleConfirmationPanel(g, v, "Error", output)
+    }
+    refreshSidePanels(g, v)
+    return handleCommitSelect(g, v)
+  })
+  return nil
+}
+
 func getSelectedBranch(v *gocui.View) Branch {
   lineNumber := getItemPosition(v)
   return state.Branches[lineNumber]

commits_panel.go

@@ -13,8 +13,8 @@ var (
 )
 
 func refreshCommits(g *gocui.Gui) error {
-  state.Commits = getCommits()
   g.Update(func(*gocui.Gui) error {
+    state.Commits = getCommits()
     v, err := g.View("commits")
     if err != nil {
       panic(err)
@@ -33,14 +33,36 @@ func refreshCommits(g *gocui.Gui) error {
       shaColor.Fprint(v, commit.Sha+" ")
       white.Fprintln(v, commit.Name)
     }
+    refreshStatus(g)
     return nil
   })
   return nil
 }
 
+func handleResetToCommit(g *gocui.Gui, commitView *gocui.View) error {
+  return createConfirmationPanel(g, commitView, "Reset To Commit", "Are you sure you want to reset to this commit? (y/n)", func(g *gocui.Gui, v *gocui.View) error {
+    commit, err := getSelectedCommit(g)
+    devLog(commit)
+    if err != nil {
+      panic(err)
+    }
+    if output, err := gitResetToCommit(commit.Sha); err != nil {
+      return createSimpleConfirmationPanel(g, commitView, "Error", output)
+    }
+    if err := refreshCommits(g); err != nil {
+      panic(err)
+    }
+    if err := refreshFiles(g); err != nil {
+      panic(err)
+    }
+    resetOrigin(commitView)
+    return handleCommitSelect(g, nil)
+  }, nil)
+}
+
 func handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
-  renderString(g, "options", "s: squash down, r: rename")
+  renderString(g, "options", "s: squash down, r: rename, g: reset to this commit")
-  commit, err := getSelectedCommit(v)
+  commit, err := getSelectedCommit(g)
   if err != nil {
     if err != ErrNoCommits {
       return err
@@ -55,7 +77,10 @@ func handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error {
   if getItemPosition(v) != 0 {
     return createSimpleConfirmationPanel(g, v, "Error", "Can only squash topmost commit")
   }
-  commit, err := getSelectedCommit(v)
+  if len(state.Commits) == 1 {
+    return createSimpleConfirmationPanel(g, v, "Error", "You have no commits to squash with")
+  }
+  commit, err := getSelectedCommit(g)
   if err != nil {
     return err
   }
@@ -65,6 +90,7 @@ func handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error {
   if err := refreshCommits(g); err != nil {
     panic(err)
   }
+  refreshStatus(g)
   return handleCommitSelect(g, v)
 }
 
@@ -84,10 +110,18 @@ func handleRenameCommit(g *gocui.Gui, v *gocui.View) error {
   return nil
 }
 
-func getSelectedCommit(v *gocui.View) (Commit, error) {
+func getSelectedCommit(g *gocui.Gui) (Commit, error) {
+  v, err := g.View("commits")
+  if err != nil {
+    panic(err)
+  }
   if len(state.Commits) == 0 {
     return Commit{}, ErrNoCommits
   }
   lineNumber := getItemPosition(v)
+  if lineNumber > len(state.Commits)-1 {
+    colorLog(color.FgRed, "potential error in getSelected Commit (mismatched ui and state)", state.Commits, lineNumber)
+    return state.Commits[len(state.Commits)-1], nil
+  }
   return state.Commits[lineNumber], nil
 }

gitcommands.go

@@ -357,8 +357,19 @@ func gitRenameCommit(message string) (string, error) {
   return runDirectCommand("git commit --allow-empty --amend -m \"" + message + "\"")
 }
 
+func gitFetch() (string, error) {
+  return runDirectCommand("git fetch")
+}
+
+func gitResetToCommit(sha string) (string, error) {
+  return runDirectCommand("git reset " + sha)
+}
+
+func gitNewBranch(name string) (string, error) {
+  return runDirectCommand("git checkout -b " + name)
+}
+
 func gitUpstreamDifferenceCount() (string, string) {
-  // TODO: deal with these errors which appear when we haven't yet pushed a feature branch
   pushableCount, err := runDirectCommand("git rev-list @{u}..head --count")
   if err != nil {
     return "?", "?"
@@ -367,7 +378,7 @@ func gitUpstreamDifferenceCount() (string, string) {
   if err != nil {
     return "?", "?"
   }
-  return strings.Trim(pullableCount, " \n"), strings.Trim(pushableCount, " \n")
+  return strings.Trim(pushableCount, " \n"), strings.Trim(pullableCount, " \n")
 }
 
 func gitCommitsToPush() []string {

gui.go

@@ -6,6 +6,7 @@ import (
   // "io/ioutil"
 
   "log"
+  "time"
   // "strings"
 
   "github.com/jroimartin/gocui"
@@ -155,22 +156,26 @@ func keybindings(g *gocui.Gui) error {
   if err := g.SetKeybinding("branches", 'F', gocui.ModNone, handleForceCheckout); err != nil {
     return err
   }
+  if err := g.SetKeybinding("branches", 'n', gocui.ModNone, handleNewBranch); err != nil {
+    return err
+  }
   if err := g.SetKeybinding("commits", 's', gocui.ModNone, handleCommitSquashDown); err != nil {
     return err
   }
   if err := g.SetKeybinding("commits", 'r', gocui.ModNone, handleRenameCommit); err != nil {
     return err
   }
-  if err := g.SetKeybinding("", '∑', gocui.ModNone, handleLogState); err != nil {
+  if err := g.SetKeybinding("commits", 'g', gocui.ModNone, handleResetToCommit); err != nil {
+    return err
+  }
+  if err := g.SetKeybinding("", 'S', gocui.ModNone, genericTest); err != nil {
     return err
   }
   return nil
 }
 
-func handleLogState(g *gocui.Gui, v *gocui.View) error {
+func genericTest(g *gocui.Gui, v *gocui.View) error {
-  devLog("state is:", state)
+  pushFiles(g, v)
-  devLog("previous view:", state.PreviousView)
-  refreshBranches(g)
   return nil
 }
 
@@ -247,6 +252,11 @@ func layout(g *gocui.Gui) error {
   return nil
 }
 
+func fetch(g *gocui.Gui) {
+  gitFetch()
+  refreshStatus(g)
+}
+
 func run() {
   g, err := gocui.NewGui(gocui.OutputNormal)
   if err != nil {
@@ -254,6 +264,13 @@ func run() {
   }
   defer g.Close()
 
+  // periodically fetching to check for upstream differences
+  go func() {
+    for range time.Tick(time.Second * 60) {
+      fetch(g)
+    }
+  }()
+
   g.SetManagerFunc(layout)
 
   if err := keybindings(g); err != nil {

status_panel.go

@@ -11,20 +11,26 @@ import (
 func refreshStatus(g *gocui.Gui) error {
   v, err := g.View("status")
   if err != nil {
-    return err
+    panic(err)
   }
-  v.Clear()
+  // for some reason if this isn't wrapped in an update the clear seems to
-  up, down := gitUpstreamDifferenceCount()
+  // be applied after the other things or something like that; the panel's
-  fmt.Fprint(v, "↑"+up+"↓"+down)
+  // contents end up cleared
-  branches := state.Branches
+  g.Update(func(*gocui.Gui) error {
-  if len(branches) == 0 {
+    v.Clear()
+    pushables, pullables := gitUpstreamDifferenceCount()
+    fmt.Fprint(v, "↑"+pushables+"↓"+pullables)
+    branches := state.Branches
+    if len(branches) == 0 {
+      return nil
+    }
+    branch := branches[0]
+    // utilising the fact these all have padding to only grab the name
+    // from the display string with the existing coloring applied
+    fmt.Fprint(v, " "+branch.DisplayString[4:])
+    colorLog(color.FgCyan, time.Now().Sub(StartTime))
     return nil
-  }
+  })
-  branch := branches[0]
-  // utilising the fact these all have padding to only grab the name
-  // from the display string with the existing coloring applied
-  fmt.Fprint(v, " "+branch.DisplayString[4:])
 
-  colorLog(color.FgCyan, time.Now().Sub(StartTime))
   return nil
 }

view_helpers.go

@@ -1,9 +1,3 @@
-// lots of this has been directly ported from one of the example files, will brush up later
-
-// Copyright 2014 The gocui Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package main
 
 import (