Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.2 and tip

stable nautilus: disable demandimport after our own imports

Also removes some tabs that snuck into the file. Contributed by
Alex<i>b adob321@gmail.com

Changeset d4016fbb0777…

Parent 243a38c529df…

by Steve Borho

Changes to one file · Browse files at d4016fbb0777 Showing diff from parent 243a38c529df Diff from another changeset...

Change 1 of 2 Show Entire File contrib/​nautilus-thg.py Stacked
 
57
58
59
 
 
60
61
62
 
373
374
375
376
377
 
 
378
379
380
 
 
 
57
58
59
60
61
62
63
64
 
375
376
377
 
 
378
379
380
 
 
381
382
@@ -57,6 +57,8 @@
 else:   debugf = debugthg.debugf_No   +# avoid breaking other Python nautilus extensions +demandimport.disable()    nofilecmds = 'about serve synch repoconfig userconfig merge unmerge'.split()   @@ -373,8 +375,8 @@
  return True    if ui.ui().configbool("tortoisehg", "overlayicons", default = True): - class HgExtension(HgExtensionIcons, nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.PropertyPageProvider, nautilus.InfoProvider): - pass + class HgExtension(HgExtensionIcons, nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.PropertyPageProvider, nautilus.InfoProvider): + pass  else: - class HgExtension(HgExtensionDefault, nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.PropertyPageProvider): - pass + class HgExtension(HgExtensionDefault, nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.PropertyPageProvider): + pass