Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0.1, 1.0.2, and 1.0.3

stable shellext: use Deleted overlay instead of Unversioned

refs #324

Changeset c2ed17ed7188…

Parent 4bc1f2d97b49…

by Adrian Buehlmann

Changes to 4 files · Browse files at c2ed17ed7188 Showing diff from parent 4bc1f2d97b49 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​shell-register.wxi Stacked
 
68
69
70
71
72
 
 
73
74
75
 
68
69
70
 
 
71
72
73
74
75
@@ -68,8 +68,8 @@
  Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgModified)'   />   <RegistryValue - Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Unversioned' - Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgUnversioned)' + Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Deleted' + Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgDeleted)'   />     <!-- Mark all as approved -->
Change 1 of 2 Show Entire File win32/​shellext/​ShellExt.cpp Stacked
 
16
17
18
19
 
20
21
22
 
116
117
118
119
 
120
121
122
 
123
124
125
 
16
17
18
 
19
20
21
22
 
116
117
118
 
119
120
121
 
122
123
124
125
@@ -16,7 +16,7 @@
 #define CLSID_TortoiseHgNormal TOLSTR2(THG_CLSID_TortoiseHgNormal)  #define CLSID_TortoiseHgAdded TOLSTR2(THG_CLSID_TortoiseHgAdded)  #define CLSID_TortoiseHgModified TOLSTR2(THG_CLSID_TortoiseHgModified) -#define CLSID_TortoiseHgUnversioned TOLSTR2(THG_CLSID_TortoiseHgUnversioned) +#define CLSID_TortoiseHgDeleted TOLSTR2(THG_CLSID_TortoiseHgDeleted)      UINT g_cRefThisDll = 0; @@ -116,10 +116,10 @@
  ++InitStatus::inst().modified_;   return pcf->QueryInterface(riid, ppvOut);   } - else if (clsid == CLSID_TortoiseHgUnversioned) + else if (clsid == CLSID_TortoiseHgDeleted)   {   FactOvl *pcf = new FactOvl('?'); // not in repo - TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHgUnversioned"); + TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHgDeleted");   ++InitStatus::inst().notinrepo_;   return pcf->QueryInterface(riid, ppvOut);   }
Change 1 of 1 Show Entire File win32/​shellext/​ThgCLSIDs-template.wxi Stacked
 
4
5
6
7
 
8
9
 
10
11
 
4
5
6
 
7
8
 
9
10
11
@@ -4,8 +4,8 @@
  <?define CLSID_TortoiseHgNormal = THG_CLSID_TortoiseHgNormal ?>   <?define CLSID_TortoiseHgAdded = THG_CLSID_TortoiseHgAdded ?>   <?define CLSID_TortoiseHgModified = THG_CLSID_TortoiseHgModified ?> - <?define CLSID_TortoiseHgUnversioned = THG_CLSID_TortoiseHgUnversioned ?> + <?define CLSID_TortoiseHgDeleted = THG_CLSID_TortoiseHgDeleted ?>   <?define OverlayCLSIDList = - THG_CLSID_TortoiseHgNormal;THG_CLSID_TortoiseHgAdded;THG_CLSID_TortoiseHgModified;THG_CLSID_TortoiseHgUnversioned + THG_CLSID_TortoiseHgNormal;THG_CLSID_TortoiseHgAdded;THG_CLSID_TortoiseHgModified;THG_CLSID_TortoiseHgDeleted   ?>  </Include>
Change 1 of 1 Show Entire File win32/​shellext/​ThgCLSIDs.h Stacked
 
5
6
7
8
 
9
10
 
5
6
7
 
8
9
10
@@ -5,6 +5,6 @@
 #define THG_CLSID_TortoiseHgNormal {869C8877-2C3C-438D-844B-31B86BFE5E8A}  #define THG_CLSID_TortoiseHgAdded {AF42ADAB-8C2E-4285-B746-99B31094708E}  #define THG_CLSID_TortoiseHgModified {CDA1C89D-E9B5-4981-A857-82DD932EA2FD} -#define THG_CLSID_TortoiseHgUnversioned {9E3D4EC9-0624-4393-8B48-204C217ED1FF} +#define THG_CLSID_TortoiseHgDeleted {ABE816D4-0AFA-4297-964E-533006FCCAC5}    #endif