Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc1, 0.4rc2, and 0.4rc3

hggtk/thgconfig: make new filemerge code hg version safe

Changeset 517a26313bcd…

Parent a1ef8d133b7b…

by Steve Borho

Changes to one file · Browse files at 517a26313bcd Showing diff from parent a1ef8d133b7b Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​thgconfig.py Stacked
 
9
10
11
12
 
13
14
15
 
414
415
416
417
418
419
420
421
422
423
424
425
 
 
 
 
 
 
 
 
 
 
 
 
 
426
427
428
 
9
10
11
 
12
13
14
15
 
414
415
416
 
 
 
 
 
 
 
 
 
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
@@ -9,7 +9,7 @@
 import gobject  import os  import pango -from mercurial import hg, ui, cmdutil, util, filemerge +from mercurial import hg, ui, cmdutil, util  from dialog import error_dialog, question_dialog  import shlib  import shelve @@ -414,15 +414,19 @@
  values.append(name[4:])   elif cpath == 'ui.merge':   # Special case, add [merge-tools] to possible values - tools = [] - for key, value in self.ui.configitems('merge-tools'): - t = key.split('.')[0] - if t not in tools: - tools.append(t) - for t in tools: - # Ensure the tool is installed - if filemerge._findtool(self.ui, t): - values.append(t) + try: + from mercurial import filemerge + tools = [] + for key, value in self.ui.configitems('merge-tools'): + t = key.split('.')[0] + if t not in tools: + tools.append(t) + for t in tools: + # Ensure the tool is installed + if filemerge._findtool(self.ui, t): + values.append(t) + except ImportError: + pass     currow = None   vlist.append([_unspecstr, False])