Branch list & checkout

Author: golbin

controller/branch.js

@@ -0,0 +1,57 @@
+var _ = require('lodash');
+
+var BranchView = require('../view/branch');
+
+var parent = null,
+    view   = null;
+
+var branch = {
+  loadBranches: function () {
+    return parent.git.loadBranches()
+      .map(function (branchName, index) {
+        if (index === parent.git.currentBranchIndex) {
+          return "  * " + branchName;
+        } else {
+          return "    " + branchName;
+        }
+      });
+  },
+
+  show: function () {
+    view.list.setItems(branch.loadBranches());
+    view.list.select(parent.git.currentBranchIndex);
+
+    view.layout.show();
+    view.list.focus();
+    view.layout.parent.render();
+  },
+
+  hide: function (reload) {
+    view.layout.hide();
+    parent.show(reload);
+  },
+
+  init: function (delegate) {
+    parent = delegate;
+
+    view = BranchView(parent.screen);
+
+    view.list.key(['enter'], function () {
+      try {
+        parent.git.checkout(this.selected);
+        branch.hide(true);
+      } catch (e) {
+        branch.hide(true);
+        parent.showPopup(_.trim(e.stderr.toString()), 3);
+      }
+    });
+
+    view.list.key(['escape'], function () {
+      branch.hide();
+    });
+  }
+};
+
+
+module.exports = branch;
+

controller/main.js

@@ -4,6 +4,7 @@ var Git  = require('../model/git'),
     view = require('../view/main');
 
 var editor = require('./editor'),
+    branch = require('./branch'),
     log    = require('./log'),
     diff   = require('./diff');
 
@@ -148,12 +149,12 @@ var main = {
     this.setItem(this.selected, "   " + content.substr(3));
   },
 
-  showPopup: function (msg) {
-    view.popup.content = "{center}" + msg + "{/center}";
+  showPopup: function (msg, hideAfter) {
+    view.popup.content = msg;
     view.popup.hidden  = false;
     redraw();
 
-    setTimeout(main.hidePopup, 1000);
+    setTimeout(main.hidePopup, hideAfter ? hideAfter : 1000);
   },
 
   hidePopup: function () {
@@ -171,6 +172,9 @@ log.init(main);
 // bind diff viewer
 diff.init(main);
 
+// bind branch viewer
+branch.init(main);
+
 // bind keys
 // TODO: Need to refactor
 _.each(view.list, function (elem) {
@@ -221,8 +225,6 @@ _.each(view.list, function (elem) {
     main.show(log);
   });
 
-  //elem.unkey(['C-d']);
-
   elem.key(['C-d'], function () {
     if (this.getItem(this.selected) === undefined) {
       main.showPopup("There is no diff file you selected");
@@ -232,6 +234,10 @@ _.each(view.list, function (elem) {
     main.show(diff);
   });
 
+  elem.key(['C-b'], function () {
+    main.show(branch);
+  });
+
   elem.key(['tab'], function () {
     if (view.list.staged.interactive) {
       main.moveToUnstaged();

model/git.js

@@ -216,7 +216,7 @@ Git.prototype.loadBranches = function () {
 
   var stdout = execSync(gitCommand);
 
-  this.branches = stdout.toString().split('\n')
+  this.branches = _.trim(stdout.toString()).split('\n')
     .map(function (line, index) {
       if (line.charAt(0) === '*') {
         self.currentBranchIndex = index;
@@ -232,4 +232,14 @@ Git.prototype.getCurrentBranchName = function () {
   return this.branches[this.currentBranchIndex];
 };
 
+Git.prototype.checkout = function (branchIndex) {
+  var gitCommand = gitExec + ' checkout ' + this.branches[branchIndex];
+
+  var stdout = execSync(gitCommand, {stdio: [0, 1, 'pipe']});
+
+  this.currentBranchIndex = branchIndex;
+
+  return this.currentBranchIndex;
+};
+
 module.exports = Git;

view/branch.js

@@ -0,0 +1,26 @@
+var blessed = require('blessed'),
+    styles  = require('./style/branch.json');
+
+var layout  = null,
+    list    = null,
+    menubar = null;
+
+var init = function (screen) {
+  styles.layout.parent = screen;
+
+  layout = blessed.layout(styles.layout);
+
+  styles.list.parent    = layout;
+  styles.menubar.parent = layout;
+
+  list    = blessed.list(styles.list);
+  menubar = blessed.listbar(styles.menubar);
+
+  return {
+    layout : layout,
+    list   : list,
+    menubar: menubar
+  };
+};
+
+module.exports = init;

view/main.js

@@ -52,7 +52,7 @@ blessed.listbar(styles.menubar2);
 
 var loading = blessed.loading(styles.loading);
 
-var popup = blessed.box(styles.popup);
+var popup = blessed.text(styles.popup);
 
 module.exports = {
   screen   : screen,

view/style/branch.json

@@ -0,0 +1,66 @@
+{
+    "layout": {
+        "hidden": true,
+        "top": "center",
+        "left": "center",
+        "width": "50%",
+        "height": "50%"
+    },
+    "list": {
+        "top": "top",
+        "left": "left",
+        "width": "100%",
+        "height": "100%-4",
+        "data": null,
+        "border": "line",
+        "align": "left",
+        "vi": true,
+        "keys": true,
+        "style": {
+            "border": {
+                "fg": "white"
+            },
+            "selected": {
+                "bg": "blue"
+            }
+        }
+    },
+    "menubar": {
+        "align": "center",
+        "bottom": 0,
+        "width": "100%",
+        "height": 3,
+        "border": "line",
+        "mouse": true,
+        "vi": true,
+        "keys": true,
+        "style": {
+            "prefix": {
+                "fg": "white"
+            },
+            "item": {
+                "fg": "cyan"
+            },
+            "selected": {
+                "fg": "cyan"
+            }
+        },
+        "commands": {
+            "CHECKOUT": {
+                "keys": [
+                    "ENTER"
+                ]
+            },
+            "ADD": {
+                "keys": [
+                    "C-a"
+                ]
+            },
+            "DEL": {
+                "keys": [
+                    "C-d"
+                ]
+            }
+        }
+    }
+}

view/style/main.json

@@ -159,18 +159,23 @@
                     "C-l"
                 ]
             },
-            "DIFF": {
+            "DIFF ": {
                 "keys": [
                     "C-d"
                 ]
+            },
+            "BRANCH": {
+                "keys": [
+                    "C-b"
+                ]
             }
         }
     },
     "loading": {
         "top": "center",
         "left": "center",
-        "height": 5,
         "align": "center",
+        "height": 5,
         "width": "50%",
         "tags": true,
         "hidden": true,
@@ -179,12 +184,18 @@
     "popup": {
         "top": "center",
         "left": "center",
-        "height": 3,
-        "align": "center",
-        "width": "50%",
+        "align": "left",
+        "height": "shrink",
+        "width": "shrink",
         "tags": true,
         "hidden": true,
         "border": "line",
+        "padding": {
+            "top": 1,
+            "bottom": 1,
+            "left": 3,
+            "right": 3
+        },
         "style": {
             "border": {
                 "fg": "red"