Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.5, 0.6, and 0.7

tortoise: revise registry handling for TortoiseOverlays.dll

implementation adapted from TortoiseBzr

Changeset 959fb18266a7…

Parent 160e2fef05e9…

by TK Soh

Changes to 3 files · Browse files at 959fb18266a7 Showing diff from parent 160e2fef05e9 Diff from another changeset...

Change 1 of 1 Show Entire File tortoise/​contextmenu.py Stacked
 
129
130
131
132
133
134
135
136
137
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
138
139
140
 
129
130
131
 
 
 
 
 
 
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
@@ -129,12 +129,24 @@
  ]     registry_keys = [ - (_winreg.HKEY_CLASSES_ROOT, r"*\shellex\ContextMenuHandlers\TortoiseHg"), - (_winreg.HKEY_CLASSES_ROOT, r"Directory\Background\shellex\ContextMenuHandlers\TortoiseHg"), - (_winreg.HKEY_CLASSES_ROOT, r"Directory\shellex\ContextMenuHandlers\TortoiseHg"), - (_winreg.HKEY_CLASSES_ROOT, r"Folder\shellex\ContextMenuHandlers\TortoiseHg"), - (_winreg.HKEY_CLASSES_ROOT, r"Directory\shellex\DragDropHandlers\TortoiseHg"), - (_winreg.HKEY_CLASSES_ROOT, r"Folder\shellex\DragDropHandlers\TortoiseHg"), + (_winreg.HKEY_CLASSES_ROOT, + r"*\shellex\ContextMenuHandlers\TortoiseHg", + [(None, _reg_clsid_)]), + (_winreg.HKEY_CLASSES_ROOT, + r"Directory\Background\shellex\ContextMenuHandlers\TortoiseHg", + [(None, _reg_clsid_)]), + (_winreg.HKEY_CLASSES_ROOT, + r"Directory\shellex\ContextMenuHandlers\TortoiseHg", + [(None, _reg_clsid_)]), + (_winreg.HKEY_CLASSES_ROOT, + r"Folder\shellex\ContextMenuHandlers\TortoiseHg", + [(None, _reg_clsid_)]), + (_winreg.HKEY_CLASSES_ROOT, + r"Directory\shellex\DragDropHandlers\TortoiseHg", + [(None, _reg_clsid_)]), + (_winreg.HKEY_CLASSES_ROOT, + r"Folder\shellex\DragDropHandlers\TortoiseHg", + [(None, _reg_clsid_)]),   ]     def __init__(self):
Change 1 of 1 Show Entire File tortoise/​iconoverlay.py Stacked
 
229
230
231
232
 
 
 
 
233
234
235
 
229
230
231
 
232
233
234
235
236
237
238
@@ -229,7 +229,10 @@
  prog_id = "Mercurial.ShellExtension.%s" % classname   desc = "Mercurial icon overlay shell extension for %s files" % name.lower()   reg = [ - (_winreg.HKEY_LOCAL_MACHINE, r"Software\TortoiseOverlays\%s" % icon_type) ] + (_winreg.HKEY_LOCAL_MACHINE, + r"Software\TortoiseOverlays\%s" % icon_type, + [("TortoiseHg", clsid)]) + ]   cls = type(   classname,   (IconOverlayExtension, ),
Change 1 of 5 Show Entire File tortoisehg.py Stacked
 
26
27
28
 
 
 
 
 
 
 
 
 
 
29
30
31
 
39
40
41
 
42
43
44
 
71
72
73
74
75
 
 
 
 
 
76
77
78
 
85
86
87
88
89
90
91
92
93
94
 
 
 
 
 
 
 
 
95
96
97
 
104
105
106
 
 
107
108
109
 
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
 
49
50
51
52
53
54
55
 
82
83
84
 
 
85
86
87
88
89
90
91
92
 
99
100
101
 
 
 
 
 
 
 
102
103
104
105
106
107
108
109
110
111
112
 
119
120
121
122
123
124
125
126
@@ -26,6 +26,16 @@
 bin_path = os.path.dirname(os.path.join(os.getcwd(), sys.argv[0]))  print "bin path = ", bin_path   +def check_tortoise_overlays(): + # TortoiseOverlays must be installed, and we must be able to write there. + try: + hkey = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, + r"Software\TortoiseOverlays", 0, + _winreg.KEY_ALL_ACCESS) + except WindowsError: + print "TortoiseOverlays is not installed." + sys.exit(1) +  # TortoiseHg registry setup  def register_tortoise_path(unregister=False):   key = r"Software\TortoiseHg" @@ -39,6 +49,7 @@
   # for COM registration via py2exe  def DllRegisterServer(): + check_tortoise_overlays()   RegisterServer(ContextMenuExtension)   RegisterServer(ChangedOverlay)   RegisterServer(AddedOverlay) @@ -71,8 +82,11 @@
  pass     # Add the appropriate shell extension registry keys - for category, keyname in cls.registry_keys: - _winreg.SetValue(category, keyname, _winreg.REG_SZ, cls._reg_clsid_) + for category, keyname, values in cls.registry_keys: + hkey = _winreg.CreateKey(category, keyname) + for (name, val) in values: + # todo: handle ints? + _winreg.SetValueEx(hkey, name, 0, _winreg.REG_SZ, val)     # register the extension on Approved list   try: @@ -85,13 +99,14 @@
  print cls._reg_desc_, "registration complete."    def UnregisterServer(cls): - for category, keyname in cls.registry_keys: - try: - _winreg.DeleteKey(category, keyname) - except WindowsError, details: - import errno - if details.errno != errno.ENOENT: - raise + for category, keyname, values in cls.registry_keys: + hkey = _winreg.OpenKey(category, keyname, 0, _winreg.KEY_ALL_ACCESS) + for (name, val) in values: + # todo: handle ints? + try: + _winreg.DeleteValue(hkey, name) + except WindowsError, exc: + print "Failed to remove registry key %s: %s" % (keyname, exc)     # unregister the extension from Approved list   try: @@ -104,6 +119,8 @@
  print cls._reg_desc_, "unregistration complete."    if __name__=='__main__': + check_tortoise_overlays() +   from win32com.server import register   register.UseCommandLine(ContextMenuExtension,   finalize_register = lambda: RegisterServer(ContextMenuExtension),