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

stable visdiff: trap OSError from extdiff.dodiff()

On Windows, extdiff often throws WindowsError (derived from OSError) when
the diff tool forks a background process and hoses the attempt to clean up
temporary files.

Refs #499

Changeset 90809c4b2151…

Parent 6fb8c70dd82e…

by Steve Borho

Changes to one file · Browse files at 90809c4b2151 Showing diff from parent 6fb8c70dd82e Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​visdiff.py Stacked
 
290
291
292
293
 
 
 
 
 
294
295
296
 
290
291
292
 
293
294
295
296
297
298
299
300
@@ -290,7 +290,11 @@
  ui.warn(_('Extdiff command not recognized\n'))   return   pats = hglib.canonpaths(pats) - ret = extdiff.dodiff(ui, repo, diffcmd, diffopts, pats, opts) + try: + ret = extdiff.dodiff(ui, repo, diffcmd, diffopts, pats, opts) + except OSError, e: + ui.warn(str(e) + '\n') + return   if ret == 0:   gdialog.Prompt(_('No file changes'),   _('There are no file changes to view'), None).run()