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 with stable

Changeset 123811ec40a6…

Parents 9d3da274f8a2…

Parents 4eb7cd383504…

by Steve Borho

Changes to one file · Browse files at 123811ec40a6 Showing diff from parent 9d3da274f8a2 4eb7cd383504 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​visdiff.py Stacked
 
201
202
203
204
 
205
206
207
208
 
 
 
 
 
 
 
 
 
 
 
 
209
210
211
 
201
202
203
 
204
205
206
207
 
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
@@ -201,11 +201,22 @@
  if len(model) == 1 and self.singlecheck.get_active():   self.launch(*model[0])   - def delete_tmproot(self, _, tmproot): + def delete_tmproot(self, window, tmproot):   vsettings = settings.Settings('visdiff')   vsettings.set_value('launchsingle', self.singlecheck.get_active())   vsettings.write() - shutil.rmtree(tmproot) + while True: + try: + shutil.rmtree(tmproot) + return + except (IOError, OSError), e: + resp = gdialog.CustomPrompt(_('Unable to delete temp files'), + _('Close diff tools and try again, or quit to leak files?'), + self, (_('Try &Again'), _('&Quit')), _('q')).run() + if resp == ord(_('a')): + continue + else: + return     def rowactivated(self, tree, path, column):   selection = tree.get_selection()