From 7d05c5167da499e72e13678b20bb2af379bf90cf Mon Sep 17 00:00:00 2001
From: Peter Cottle <petermcottle@gmail.com>
Date: Thu, 20 Dec 2012 12:16:40 -0800
Subject: [PATCH] nice have left and right view also

---
 build/bundle.js            | 12 ++++++++----
 src/js/git/index.js        |  2 +-
 src/js/views/rebaseView.js |  4 +++-
 src/style/main.css         | 32 +-------------------------------
 4 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/build/bundle.js b/build/bundle.js
index 0e4233df..cd925a66 100644
--- a/build/bundle.js
+++ b/build/bundle.js
@@ -5632,7 +5632,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
   .then(_.bind(function(userSpecifiedRebase) {
     // first, they might have dropped everything (annoying)
     if (!userSpecifiedRebase.length) {
-      throw new GitError({
+      throw new CommandResult({
         msg: 'Nothing to do...'
       });
     }
@@ -8534,7 +8534,9 @@ var InteractiveRebaseView = ContainedBase.extend({
       this.confirm();
     }, this))
     .fail(_.bind(function() {
-      this.deferred.reject();
+      // empty array does nothing, just like in git
+      this.hide();
+      this.deferred.resolve([]);
     }, this))
     .done();
 
@@ -12650,7 +12652,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
   .then(_.bind(function(userSpecifiedRebase) {
     // first, they might have dropped everything (annoying)
     if (!userSpecifiedRebase.length) {
-      throw new GitError({
+      throw new CommandResult({
         msg: 'Nothing to do...'
       });
     }
@@ -14920,7 +14922,9 @@ var InteractiveRebaseView = ContainedBase.extend({
       this.confirm();
     }, this))
     .fail(_.bind(function() {
-      this.deferred.reject();
+      // empty array does nothing, just like in git
+      this.hide();
+      this.deferred.resolve([]);
     }, this))
     .done();
 
diff --git a/src/js/git/index.js b/src/js/git/index.js
index e7cd2622..b603f348 100644
--- a/src/js/git/index.js
+++ b/src/js/git/index.js
@@ -1017,7 +1017,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
   .then(_.bind(function(userSpecifiedRebase) {
     // first, they might have dropped everything (annoying)
     if (!userSpecifiedRebase.length) {
-      throw new GitError({
+      throw new CommandResult({
         msg: 'Nothing to do...'
       });
     }
diff --git a/src/js/views/rebaseView.js b/src/js/views/rebaseView.js
index d0319182..53891b02 100644
--- a/src/js/views/rebaseView.js
+++ b/src/js/views/rebaseView.js
@@ -99,7 +99,9 @@ var InteractiveRebaseView = ContainedBase.extend({
       this.confirm();
     }, this))
     .fail(_.bind(function() {
-      this.deferred.reject();
+      // empty array does nothing, just like in git
+      this.hide();
+      this.deferred.resolve([]);
     }, this))
     .done();
 
diff --git a/src/style/main.css b/src/style/main.css
index f8c1e677..cc164198 100644
--- a/src/style/main.css
+++ b/src/style/main.css
@@ -112,12 +112,6 @@ body,
   background: #EEE;
 }
 
-#canvasWrapper {
-}
-
-#commandTextField {
-}
-
 /* Toolbar */
 
 div.toolbar {
@@ -502,6 +496,7 @@ li.rebaseEntry.notPicked {
   vertical-align: middle;
   cursor: pointer;
 }
+
 .uiButton:hover {
   border-top-color: #28597a;
   background: #28597a;
@@ -532,18 +527,6 @@ li.rebaseEntry.notPicked {
 }
 
 .uiButtonPink {
-  padding: 5px 10px;
-  -webkit-border-radius: 8px;
-  -moz-border-radius: 8px;
-  border-radius: 8px;
-  -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0;
-  -moz-box-shadow: rgba(0,0,0,1) 0 1px 0;
-  box-shadow: rgba(0,0,0,1) 0 1px 0;
-  text-shadow: rgba(0,0,0,.4) 0 1px 0;
-  color: white;
-  vertical-align: middle;
-  cursor:pointer;
-
   border-top: 1px solid #96d1f8;
   background: #80007c;
   background: -webkit-gradient(linear, left top, left bottom, from(#fa1ee0), to(#80007c));
@@ -591,19 +574,6 @@ li.rebaseEntry.notPicked {
   background: -moz-linear-gradient(top, #d1edff, #449ad4);
   background: -ms-linear-gradient(top, #d1edff, #449ad4);
   background: -o-linear-gradient(top, #d1edff, #449ad4);
-  padding: 5px 10px;
-  -webkit-border-radius: 8px;
-  -moz-border-radius: 8px;
-  border-radius: 8px;
-  -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0;
-  -moz-box-shadow: rgba(0,0,0,1) 0 1px 0;
-  box-shadow: rgba(0,0,0,1) 0 1px 0;
-  text-shadow: rgba(0,0,0,.4) 0 1px 0;
-  color: #000000;
-  font-size: 14px;
-  font-family: Georgia, serif;
-  text-decoration: none;
-  vertical-align: middle;
 }
 
 .uiButtonWhite:hover {