Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 8267058724ab…

Parents 666e2127dc7c…

Parents d0057328f8f4…

by Adrian Buehlmann

Changes to 5 files · Browse files at 8267058724ab Showing diff from parent 666e2127dc7c d0057328f8f4 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​shell-register-overlays.wxi Stacked
 
25
26
27
28
29
 
 
30
31
32
 
25
26
27
 
 
28
29
30
31
32
@@ -25,8 +25,8 @@
  Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgModified)'   />   <RegistryValue - Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Deleted' - Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgDeleted)' + Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Unversioned' + Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgUnversioned)'   />     <!-- Mark all as approved -->
Change 1 of 2 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
17
18
19
20
 
21
22
23
 
120
121
122
123
 
124
125
126
 
17
18
19
 
20
21
22
23
 
120
121
122
 
123
124
125
126
@@ -17,7 +17,7 @@
    <?define ProgramRegKey = Software\TortoiseHg ?>   - <?define TOverlaysVersion = 1.0.15.18898 ?> + <?define TOverlaysVersion = 1.1.0.18991 ?>   <?define TOverlaysSrcDir = ..\contrib\TortoiseOverlays ?>   <?define TOverlaysSrcFilenameX86 = TortoiseOverlays-$(var.TOverlaysVersion)-win32.msm ?>   <?define TOverlaysSrcFilenameX64 = TortoiseOverlays-$(var.TOverlaysVersion)-x64.msm ?> @@ -120,7 +120,7 @@
  <File Id='thgtaskbarEXE' Name='thgtaskbar.exe' DiskId='1' KeyPath='yes'   Source='dist\thgtaskbar.exe' >   <Shortcut Id="thgtaskbarEXEshortcut" Directory="ProgramMenuDir" - Name="Overlay Icon Server" + Name="TortoiseHg Overlay Icon Server"   Icon="thgIcon.ico" IconIndex="0" Advertise="yes"   />   </File>
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_TortoiseHgDeleted TOLSTR2(THG_CLSID_TortoiseHgDeleted) +#define CLSID_TortoiseHgUnversioned TOLSTR2(THG_CLSID_TortoiseHgUnversioned)      UINT g_cRefThisDll = 0; @@ -116,10 +116,10 @@
  ++InitStatus::inst().modified_;   return pcf->QueryInterface(riid, ppvOut);   } - else if (clsid == CLSID_TortoiseHgDeleted) + else if (clsid == CLSID_TortoiseHgUnversioned)   {   FactOvl *pcf = new FactOvl('?'); // not in repo - TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHgDeleted"); + TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHgUnversioned");   ++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_TortoiseHgDeleted = THG_CLSID_TortoiseHgDeleted ?> + <?define CLSID_TortoiseHgUnversioned = THG_CLSID_TortoiseHgUnversioned ?>   <?define OverlayCLSIDList = - THG_CLSID_TortoiseHgNormal;THG_CLSID_TortoiseHgAdded;THG_CLSID_TortoiseHgModified;THG_CLSID_TortoiseHgDeleted + THG_CLSID_TortoiseHgNormal;THG_CLSID_TortoiseHgAdded;THG_CLSID_TortoiseHgModified;THG_CLSID_TortoiseHgUnversioned   ?>  </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_TortoiseHgDeleted {ABE816D4-0AFA-4297-964E-533006FCCAC5} +#define THG_CLSID_TortoiseHgUnversioned {9E3D4EC9-0624-4393-8B48-204C217ED1FF}    #endif