Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.1, 0.8.2, and 0.8.3

visdiff: fix two more issues in deletion path

Changeset 4eb7cd383504…

Parent c3647813ddd0…

by Steve Borho

Changes to one file · Browse files at 4eb7cd383504 Showing diff from parent c3647813ddd0 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​visdiff.py Stacked
 
201
202
203
204
 
205
206
207
 
209
210
211
212
 
213
214
215
 
201
202
203
 
204
205
206
207
 
209
210
211
 
212
213
214
215
@@ -201,7 +201,7 @@
  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() @@ -209,7 +209,7 @@
  try:   shutil.rmtree(tmproot)   return - except IOError: + 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()