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 53204eb3f7ee…

Parents edff140c9cdb…

Parents 73b858c678e7…

by Adrian Buehlmann

Changes to 4 files · Browse files at 53204eb3f7ee Showing diff from parent edff140c9cdb 73b858c678e7 Diff from another changeset...

Show Entire File TortoiseHgOverlayServer.py Stacked
renamed from thgtaskbar.py
(No changes)
Change 1 of 6 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
116
117
118
119
120
121
122
 
 
 
 
 
123
124
125
 
127
128
129
130
 
131
132
133
 
345
346
347
348
 
349
350
351
 
367
368
369
370
 
371
372
373
 
433
434
435
436
 
437
438
439
 
 
440
441
442
443
444
445
446
447
 
 
448
449
450
 
458
459
460
461
 
462
463
464
465
 
466
467
468
 
116
117
118
 
 
 
 
119
120
121
122
123
124
125
126
 
128
129
130
 
131
132
133
134
 
346
347
348
 
349
350
351
352
 
368
369
370
 
371
372
373
374
 
434
435
436
 
437
438
 
 
439
440
441
442
443
444
445
446
 
 
447
448
449
450
451
 
459
460
461
 
462
463
464
465
 
466
467
468
469
@@ -116,10 +116,11 @@
  Source='..\extension-versions.txt'   />   </Component> - <Component Id='thgtaskbarEXE' Guid='BEF92F4D-4442-4806-8C59-DC8BDCCCADD3'> - <File Id='thgtaskbarEXE' Name='thgtaskbar.exe' DiskId='1' KeyPath='yes' - Source='dist\thgtaskbar.exe' > - <Shortcut Id="thgtaskbarEXEshortcut" Directory="ProgramMenuDir" + <Component Id='OverlayServerEXE' Guid='DC5D9CC4-8330-4146-99EC-30D3AA255DD4'> + <File Id='OverlayServerEXE' Name='TortoiseHgOverlayServer.exe' + DiskId='1' KeyPath='yes' + Source='dist\TortoiseHgOverlayServer.exe' > + <Shortcut Id="OverlayServerEXEshortcut" Directory="ProgramMenuDir"   Name="TortoiseHg Overlay Icon Server"   Icon="thgIcon.ico" IconIndex="0" Advertise="yes"   /> @@ -127,7 +128,7 @@
  <RegistryValue   Name='TortoiseHgOverlayIconServer'   Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Run' - Type='string' Value='[INSTALLDIR]thgtaskbar.exe' + Type='string' Value='[INSTALLDIR]TortoiseHgOverlayServer.exe'   />   </Component>   <Component Id='thgshellx86dll' Guid='1126CF42-3994-428B-A746-464E1BC680F3'> @@ -345,7 +346,7 @@
  Level='1' AllowAdvertise='no'   Description='Overlay icons for 64-bit processes'   > - <ComponentRef Id='thgtaskbarEXE' /> + <ComponentRef Id='OverlayServerEXE' />   <MergeRef Id='TortoiseOverlaysMergeX64' />   <ComponentRef Id='OverlaysShellRegistrationX64' />   </Feature> @@ -367,7 +368,7 @@
  Level='1' AllowAdvertise='no'   Description='Overlay icons for 32-bit processes'   > - <ComponentRef Id='thgtaskbarEXE' /> + <ComponentRef Id='OverlayServerEXE' />   <MergeRef Id='TortoiseOverlaysMergeX86' />   <ComponentRef Id='OverlaysShellRegistrationX86' />   </Feature> @@ -433,18 +434,18 @@
  </Feature>   </Feature>   - <!-- terminate.exe terminates any running thgtaskbar.exe that supports the + <!-- terminate.exe terminates any running TortoiseHgOverlayServer.exe that supports the   terminate command over the command pipe. Windows installer sometimes - fails to shutdown thgtaskbar.exe, which occasionally leads to a crash - of thgtaskbar.exe during install, which in turn pops up an ugly crash + fails to shutdown TortoiseHgOverlayServer.exe, which occasionally leads to a crash + of TortoiseHgOverlayServer.exe during install, which in turn pops up an ugly crash   report dialog pointing to faulting module PYTHON26.DLL. -->   <Binary Id='TerminateEXE' SourceFile='win32\terminate-x86.exe' />   <CustomAction Id='CallTerminate'   BinaryKey='TerminateEXE' ExeCommand='' Return='ignore'   />   - <CustomAction Id='StartThgtaskbarEXE' - FileKey='thgtaskbarEXE' ExeCommand='' Return='asyncNoWait' + <CustomAction Id='StartOverlayServerEXE' + FileKey='OverlayServerEXE' ExeCommand='' Return='asyncNoWait'   />     <InstallExecuteSequence> @@ -458,11 +459,11 @@
  INSTALLEDTORTOISEHGPRODUCTS   </RemoveExistingProducts>   <?if $(var.Platform) = "x64" ?> - <Custom Action='StartThgtaskbarEXE' After='InstallFinalize'> + <Custom Action='StartOverlayServerEXE' After='InstallFinalize'>   <![CDATA[&OverlaysX86=3 OR &OverlaysX64=3]]>   </Custom>   <?else?> - <Custom Action='StartThgtaskbarEXE' After='InstallFinalize'> + <Custom Action='StartOverlayServerEXE' After='InstallFinalize'>   <![CDATA[&OverlaysX86=3]]>   </Custom>   <?endif?>
Change 1 of 1 Show Entire File setup.py Stacked
 
130
131
132
133
 
134
135
136
 
130
131
132
 
133
134
135
136
@@ -130,7 +130,7 @@
  'product_version':version}   ]   extra['windows'] = [ - {'script':'thgtaskbar.py', + {'script':'TortoiseHgOverlayServer.py',   'icon_resources':[(0,'icons/thg_logo.ico')],   'description':'TortoiseHg Overlay Icon Server',   'copyright':thgcopyright,
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
2198
2199
2200
2201
 
2202
2203
2204
 
2198
2199
2200
 
2201
2202
2203
2204
@@ -2198,7 +2198,7 @@
    def strip_rev(self, menuitem):   def strip_completed(): - self.repo.invalidate() + hglib.invalidaterepo(self.repo)   self.reload_log()   self.changeview.clear()   rev = self.currevid