Merge branch 'rebase'

* rebase:
  cmds: do not display errors when cancelling a rebase
  xbase: save empty files when GIT_XBASE_CANCEL_ACTION=save
  xbase: refactor save() into a function

Closes git-cola#826
Signed-off-by: David Aguilar <davvid@gmail.com>

Author: davvid

cola/cmds.py

@@ -1603,6 +1603,7 @@ def __init__(self, **kwargs):
         self.env = {
             'GIT_EDITOR': prefs.editor(),
             'GIT_SEQUENCE_EDITOR': sequence_editor(),
+            'GIT_XBASE_CANCEL_ACTION': 'save',
         }
         self.env.update(kwargs)
 
@@ -1667,9 +1668,9 @@ def do(self):
                 # as much effort.
                 status, out, err = self.model.git.rebase(*args, _no_win32_startupinfo=True, **kwargs)
         self.model.update_status()
-        title = N_('Rebase stopped')
-        Interaction.command(title, 'git rebase', status, out, err)
-
+        if err.strip() != 'Nothing to do':
+            title = N_('Rebase stopped')
+            Interaction.command(title, 'git rebase', status, out, err)
         return status, out, err
 
 

share/doc/git-cola/relnotes.rst

@@ -20,6 +20,11 @@ Usability, bells and whistles
 
   https://github.com/git-cola/git-cola/pull/813
 
+* The `git xbase` rebase editor no longer displays an error when
+  cancelling an interactive rebase.
+
+  https://github.com/git-cola/git-cola/issues/814
+
 Fixes
 -----
 * The DAG window now updates itself when branches and tags are created.

share/git-cola/bin/git-xbase

@@ -159,6 +159,7 @@ class Editor(QtWidgets.QWidget):
         self.context = context
         self.filename = filename
         self.comment_char = comment_char = prefs.comment_char()
+        self.cancel_action = core.getenv('GIT_XBASE_CANCEL_ACTION', 'abort')
 
         self.notifier = notifier = observable.Observable()
         self.diff = diff.DiffWidget(notifier, context, self)
@@ -255,21 +256,31 @@ class Editor(QtWidgets.QWidget):
 
     # actions
     def cancel(self):
-        self.status = 1
-        self.exit.emit(1)
+        if self.cancel_action == 'save':
+            status = self.save('')
+        else:
+            status = 1
+
+        self.status = status
+        self.exit.emit(status)
 
     def rebase(self):
         lines = [item.value() for item in self.tree.items()]
         sequencer_instructions = '\n'.join(lines) + '\n'
+        status = self.save(sequencer_instructions)
+        self.status = status
+        self.exit.emit(status)
+
+    def save(self, string):
+        """Save the instruction sheet"""
         try:
-            core.write(self.filename, sequencer_instructions)
-            self.status = 0
-            self.exit.emit(0)
+            core.write(self.filename, string)
+            status = 0
         except Exception as e:
             msg, details = utils.format_exception(e)
             sys.stderr.write(msg + '\n\n' + details)
-            self.status = 128
-            self.exit.emit(128)
+            status = 128
+        return status
 
     def external_diff(self):
         items = self.tree.selected_items()