Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable rebase: when rebase is aborted, display an appropriate message.

Changeset 8465b2bc40ae…

Parent 56f3a2d7f8e7…

by Daniel Atallah

Changes to one file · Browse files at 8465b2bc40ae Showing diff from parent 56f3a2d7f8e7 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​rebase.py Stacked
 
28
29
30
 
31
32
33
 
169
170
171
 
172
173
174
175
176
177
 
 
 
 
178
179
180
 
28
29
30
31
32
33
34
 
170
171
172
173
174
175
176
177
178
 
179
180
181
182
183
184
185
@@ -28,6 +28,7 @@
  self.setWindowFlags(f & ~Qt.WindowContextHelpButtonHint)   self.repo = repo   self.opts = opts + self.aborted = False     box = QVBoxLayout()   box.setSpacing(8) @@ -169,12 +170,16 @@
  def abort(self):   cmdline = ['rebase', '--repository', self.repo.root, '--abort']   self.repo.incrementBusyCount() + self.aborted = True   self.cmd.run(cmdline)     def commandFinished(self, ret):   self.repo.decrementBusyCount()   if self.checkResolve() is False: - self.showMessage.emit(_('Rebase is complete')) + msg = _('Rebase is complete') + if self.aborted: + msg = _('Rebase aborted') + self.showMessage.emit(msg)   self.rebasebtn.setEnabled(True)   self.rebasebtn.setText(_('Close'))   self.rebasebtn.clicked.disconnect(self.rebase)