Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

shellext: show a question mark on dirs if there is no thgstatus

I've used the 'Unversioned' overlay of TortoiseOverlays

Changeset c6953dffe7b7…

Parent 9b5fa39d6f86…

by Adrian Buehlmann

Changes to 4 files · Browse files at c6953dffe7b7 Showing diff from parent 9b5fa39d6f86 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​win32/​registry.iss Stacked
 
7
8
9
 
10
11
12
13
14
 
15
16
17
18
19
 
20
21
22
23
24
 
 
 
 
 
 
25
26
27
28
 
29
30
31
32
33
 
34
35
36
 
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
@@ -7,30 +7,41 @@
 Root: HKLM; Subkey: Software\TortoiseHg; ValueType: string; ValueName: ; ValueData: {app}    ; Icon handler COM controls +; Normal  Root: HKCR; Subkey: CLSID\{{B456DBA0-7BF4-478c-937A-05130C2C212E}; Flags: uninsdeletekey  Root: HKCR; Subkey: CLSID\{{B456DBA0-7BF4-478c-937A-05130C2C212E}; ValueType: string; ValueName: ; ValueData: TortoiseHg  Root: HKCR; Subkey: CLSID\{{B456DBA0-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ; ValueData: {app}\THgShell.dll  Root: HKCR; Subkey: CLSID\{{B456DBA0-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ThreadingModel; ValueData: Apartment   +; Added  Root: HKCR; Subkey: CLSID\{{B456DBA1-7BF4-478c-937A-05130C2C212E}; Flags: uninsdeletekey  Root: HKCR; Subkey: CLSID\{{B456DBA1-7BF4-478c-937A-05130C2C212E}; ValueType: string; ValueName: ; ValueData: TortoiseHg  Root: HKCR; Subkey: CLSID\{{B456DBA1-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ; ValueData: {app}\THgShell.dll  Root: HKCR; Subkey: CLSID\{{B456DBA1-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ThreadingModel; ValueData: Apartment   +; Modified  Root: HKCR; Subkey: CLSID\{{B456DBA2-7BF4-478c-937A-05130C2C212E}; Flags: uninsdeletekey  Root: HKCR; Subkey: CLSID\{{B456DBA2-7BF4-478c-937A-05130C2C212E}; ValueType: string; ValueName: ; ValueData: TortoiseHg  Root: HKCR; Subkey: CLSID\{{B456DBA2-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ; ValueData: {app}\THgShell.dll  Root: HKCR; Subkey: CLSID\{{B456DBA2-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ThreadingModel; ValueData: Apartment   +; Unversioned +Root: HKCR; Subkey: CLSID\{{B456DBA6-7BF4-478c-937A-05130C2C212E}; Flags: uninsdeletekey +Root: HKCR; Subkey: CLSID\{{B456DBA6-7BF4-478c-937A-05130C2C212E}; ValueType: string; ValueName: ; ValueData: TortoiseHg +Root: HKCR; Subkey: CLSID\{{B456DBA6-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ; ValueData: {app}\THgShell.dll +Root: HKCR; Subkey: CLSID\{{B456DBA6-7BF4-478c-937A-05130C2C212E}\InProcServer32; ValueType: string; ValueName: ThreadingModel; ValueData: Apartment +  ; The actual icon overlay handlers for Explorer  Root: HKLM; Subkey: Software\TortoiseOverlays\Normal; ValueType: string; ValueName: TortoiseHg; ValueData: {{B456DBA0-7BF4-478c-937A-05130C2C212E}  Root: HKLM; Subkey: Software\TortoiseOverlays\Added; ValueType: string; ValueName: TortoiseHg; ValueData: {{B456DBA1-7BF4-478c-937A-05130C2C212E}  Root: HKLM; Subkey: Software\TortoiseOverlays\Modified; ValueType: string; ValueName: TortoiseHg; ValueData: {{B456DBA2-7BF4-478c-937A-05130C2C212E} +Root: HKLM; Subkey: Software\TortoiseOverlays\Unversioned; ValueType: string; ValueName: TortoiseHg; ValueData: {{B456DBA6-7BF4-478c-937A-05130C2C212E}    ; Make them approved by administrator  Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved; ValueType: string; ValueName: {{B456DBA0-7BF4-478c-937A-05130C2C212E}; ValueData: TortoiseHg; Flags: uninsdeletevalue  Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved; ValueType: string; ValueName: {{B456DBA1-7BF4-478c-937A-05130C2C212E}; ValueData: TortoiseHg; Flags: uninsdeletevalue  Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved; ValueType: string; ValueName: {{B456DBA2-7BF4-478c-937A-05130C2C212E}; ValueData: TortoiseHg; Flags: uninsdeletevalue +Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved; ValueType: string; ValueName: {{B456DBA6-7BF4-478c-937A-05130C2C212E}; ValueData: TortoiseHg; Flags: uninsdeletevalue    ; Context menu handlers  Root: HKCR; Subkey: Directory\shellex\ContextMenuHandlers\TortoiseHgCMenu; Flags: uninsdeletekey
Change 1 of 1 Show Entire File win32/​shellext/​IconOverlay.cpp Stacked
 
66
67
68
 
 
69
70
71
 
66
67
68
69
70
71
72
73
@@ -66,6 +66,8 @@
  return S_OK;   else if (myTortoiseClass == TORTOISE_OLE_UNCHANGED && status == 'C')   return S_OK; + else if (myTortoiseClass == TORTOISE_OLE_NOTINREPO && status == '?') + return S_OK;     return S_FALSE;  }
Change 1 of 1 Show Entire File win32/​shellext/​QueryDirstate.cpp Stacked
 
156
157
158
159
160
 
161
 
 
 
 
 
 
 
 
162
163
164
165
166
167
 
168
169
170
171
172
173
 
156
157
158
 
 
159
160
161
162
163
164
165
166
167
168
169
 
 
 
 
 
170
171
 
 
172
173
174
@@ -156,18 +156,19 @@
  {   DirectoryStatus* pds = DirectoryStatus::get(cur.hgroot);   if (!pds) { - last = cur; - return 0; + outStatus = '?';   } + else + { + if (!relpath.empty()) + { + Dirstate* pds2 = Dirstatecache::get(cur.hgroot, cur.basedir); + if (pds2 && !pds2->root().getdir(relpath)) + return 0; + }   - if (!relpath.empty()) - { - Dirstate* pds2 = Dirstatecache::get(cur.hgroot, cur.basedir); - if (pds2 && !pds2->root().getdir(relpath)) - return 0; + outStatus = pds->status(relpath);   } - - outStatus = pds->status(relpath);   }   else   {
Change 1 of 1 Show Entire File win32/​shellext/​ShellExt.cpp Stacked
 
76
77
78
 
 
 
 
 
 
79
80
81
 
76
77
78
79
80
81
82
83
84
85
86
87
@@ -76,6 +76,12 @@
  TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg2");   return pcf->QueryInterface(riid, ppvOut);   } + else if (IsEqualIID(rclsid, CLSID_TortoiseHg6)) + { + CDllRegSxClassFactory *pcf = new CDllRegSxClassFactory(TORTOISE_OLE_NOTINREPO); + TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg6"); + return pcf->QueryInterface(riid, ppvOut); + }     return CLASS_E_CLASSNOTAVAILABLE;  }