Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7.4, 0.7.5, and 0.7.6

overlay: only check network drives if 'localdisks' is selected

Changeset d43e8ebc0490…

Parent 15f37a8a9713…

by TK Soh

Changes to 2 files · Browse files at d43e8ebc0490 Showing diff from parent 15f37a8a9713 Diff from another changeset...

Change 1 of 1 Show Entire File tortoise/​iconoverlay.py Stacked
 
144
145
146
147
148
149
150
151
 
 
 
152
153
154
 
144
145
146
 
 
 
 
 
147
148
149
150
151
152
@@ -144,11 +144,9 @@
  print "reading config took %d ticks" % (win32api.GetTickCount() - tc1)   print "%s: global overlayicons = " % path, global_opts   print "%s: repo overlayicons = " % path, repo_opts - tc1 = win32api.GetTickCount() - is_netdrive = thgutil.netdrive_status(path) is not None - print "netdrive check took %d ticks" % (win32api.GetTickCount() - tc1) - if (is_netdrive and 'localdisks' in global_opts) \ - or 'False' in repo_opts: + if ('False' in repo_opts or 'False' in global_opts) or \ + ('localdisks' in global_opts and + thgutil.netdrive_status(path) is not None):   print "%s: overlayicons disabled" % path   overlay_cache = {None : None}   cache_tick_count = win32api.GetTickCount()
Change 1 of 1 Show Entire File tortoise/​thgutil.py Stacked
 
81
82
83
 
84
85
86
 
81
82
83
84
85
86
87
@@ -81,6 +81,7 @@
  return True if a network drive is accessible (connected, ...),   or None if <drive> is not a network drive   """ + print "netdrive_status: checking ", drive   if hasattr(os.path, 'splitunc'):   unc, rest = os.path.splitunc(drive)   if unc: # All UNC paths (\\host\mount) are considered nonlocal