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 ef81cce513b7…

Parents 2ca16bc4dfca…

Parents 3e0d4c6dfdcc…

by Steve Borho

Changes to 2 files · Browse files at ef81cce513b7 Showing diff from parent 2ca16bc4dfca 3e0d4c6dfdcc Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​hgtk.py Stacked
 
52
53
54
 
 
55
56
57
 
52
53
54
55
56
57
58
59
@@ -52,6 +52,8 @@
  return _runcatch(u, args)   except SystemExit:   pass + except KeyboardInterrupt: + print _('\nCaught keyboard interrupt, aborting.\n')   except:   from hggtk.bugreport import run   if '--debugger' in args:
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()