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

merge: show result text and icon

Changeset 56192a3095bf…

Parent c1a089ecb1d3…

by Yuki KODAMA

Changes to one file · Browse files at 56192a3095bf Showing diff from parent c1a089ecb1d3 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
182
183
184
185
 
186
187
 
 
 
 
 
 
 
 
188
189
190
 
192
193
194
195
196
197
198
199
 
228
229
230
231
 
232
233
234
 
 
 
 
 
 
235
236
237
 
182
183
184
 
185
186
187
188
189
190
191
192
193
194
195
196
197
198
 
200
201
202
 
 
203
204
205
 
234
235
236
 
237
238
239
240
241
242
243
244
245
246
247
248
249
@@ -182,9 +182,17 @@
  oldmergeenv = os.environ.get('HGMERGE')   os.environ['HGMERGE'] = tool   - def cmd_done(returncode): + def cmd_done(returncode, useraborted):   self.switch_to(MODE_NORMAL, cmd=False)   repo = hg.repository(ui.ui(), path=paths.find_root()) + if self.notify_func: + self.notify_func(self.notify_args) + if returncode == 0: + self.cmd.set_result(_('Merged successfully'), style='ok') + elif useraborted: + self.cmd.set_result(_('Canceled merging'), style='error') + else: + self.cmd.set_result(_('Failed to merge'), style='error')   if len(repo.parents()) == 1:   return   if tool: @@ -192,8 +200,6 @@
  os.environ['HGMERGE'] = oldmergeenv   else:   del os.environ['HGMERGE'] - if self.notify_func: - self.notify_func(self.notify_args)   self.mergetool.set_sensitive(False)   self.mergelabel.set_sensitive(False)   self.mergebtn.set_sensitive(False) @@ -228,10 +234,16 @@
  return   cmdline = ['hg', 'update', '--rev', self.localrev, '--clean']   - def cmd_done(returncode): + def cmd_done(returncode, useraborted):   self.switch_to(MODE_NORMAL, cmd=False)   if self.notify_func:   self.notify_func(self.notify_args) + if returncode == 0: + self.cmd.set_result(_('Undo successfully'), style='ok') + elif useraborted: + self.cmd.set_result(_('Canceled undo'), style='error') + else: + self.cmd.set_result(_('Failed to undo'), style='error')   self.mergetool.set_sensitive(True)   self.mergelabel.set_sensitive(True)   self.mergebtn.set_sensitive(True)