Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

backout: show result text and icon

Changeset 1bfd98fff967…

Parent f32ff8178bb4…

by Yuki KODAMA

Changes to one file · Browse files at 1bfd98fff967 Showing diff from parent f32ff8178bb4 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​backout.py Stacked
 
199
200
201
202
 
203
204
205
 
 
 
 
 
 
 
 
206
207
 
199
200
201
 
202
203
 
 
204
205
206
207
208
209
210
211
212
213
@@ -199,9 +199,15 @@
  cmdline += ['--merge']   cmdline += ['--message', hglib.fromutf(msg)]   - def cmd_done(returncode): + def cmd_done(returncode, useraborted):   self.switch_to(MODE_NORMAL, cmd=False) - if returncode == 0 and not self.cmd.is_show_log(): - self.destroy() + if returncode == 0: + if not self.cmd.is_show_log(): + self.response(gtk.RESPONSE_CLOSE) + self.cmd.set_result(_('Backed out successfully'), style='ok') + elif useraborted: + self.cmd.set_result(_('Canceled backout'), style='error') + else: + self.cmd.set_result(_('Failed to backout'), style='error')   self.switch_to(MODE_WORKING)   self.cmd.execute(cmdline, cmd_done)