by
Changes to 3 files · Browse files at dabee207bdf3 Showing diff from parent dee65b2950ca dd8a1df45f03 Diff from another changeset...
@@ -402,8 +402,7 @@ self.fullmsg.split('\0', 6)
text = hglib.tounicode(text)
text = Qt.escape(text)
- text = '<b>%s</b> <span>%s</span>' % (
- addremove, text[:-1])
+ text = '<b>%s</b> <span>%s</span>' % (addremove, text)
row = [fname, rev, line, user, text]
emitrow(row)
except ValueError:
|
@@ -48,14 +48,6 @@ <?define ComponentMainExecutableGUID = {D648EC48-559C-4C66-A4CE-2D40A495DC5B} ?>
<?define ComponentWinExecutableGUID = {B4115B52-4FD3-478C-B605-D3F618287335} ?>
- <?define thgshellx86dll.guid = {728E8840-5878-4EA7-918F-281C2697ABB1} ?>
- <?define thgshellx64dll.guid = {D5D1E532-CDAD-4FFD-9695-757B8A29B4BA} ?>
-
- <?define CmenuShellRegistrationX86.guid = {2BF442D0-EBD9-4B03-8F78-0F45C28F8AB5} ?>
- <?define CmenuShellRegistrationX64.guid = {858CE519-8BA2-4E80-BBEB-591AE78384FA} ?>
-
- <?define OverlaysShellRegistrationX86.guid = {8505A107-D6B1-4EAF-9929-3D6E847B5FCB} ?>
- <?define OverlaysShellRegistrationX64.guid = {9A678A1C-72D3-4713-AD8A-E7C08ED64DC9} ?>
<?define OverlayServerEXE.guid = {62C58746-BE5D-45F0-8AB7-2FE2AB9C57B0} ?>
<?define ExtensionVersions.guid = {4ADF436B-9B25-4D95-B6AC-88717F5A037A} ?>
|
|
@@ -126,67 +126,6 @@ />
</Component>
- <?if $(var.Platform) = "x64" ?>
- <Component Id='thgshellx64dll' Guid='$(var.thgshellx64dll.guid)' Win64='yes'>
- <File Id='thgshellx64dll' Name='ThgShellx64.dll' KeyPath='yes'
- Source='../build-shellext/src/ThgShellx64.dll'/>
- <RegistryValue
- Root='HKLM' Key='$(var.ProgramRegKey)'
- Type='string' Value='[INSTALLDIR]'/>
- <RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32'
- Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/>
- <RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgDropHandler)\InProcServer32'
- Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/>
- <?foreach CLSID in $(var.OverlayCLSIDList) ?>
- <RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32'
- Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/>
- <?endforeach?>
- </Component>
- <Component Id='CmenuShellRegistrationX64' Win64='yes'
- Guid='$(var.CmenuShellRegistrationX64.guid)'>
- <?include $(var.ShellextRepoFolder)/wix/shell-register-cmenu.wxi ?>
- </Component>
- <Component Id='OverlaysShellRegistrationX64' Win64='yes'
- Guid='$(var.OverlaysShellRegistrationX64.guid)'>
- <?include $(var.ShellextRepoFolder)/wix/shell-register-overlays.wxi ?>
- </Component>
- <?else?>
- <Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)' Win64='no'>
- <File Id='thgshellx86dll' Name='ThgShellx86.dll' KeyPath='yes'
- Source='../build-shellext/src/ThgShellx86.dll'
- />
- <RegistryValue
- Root='HKLM' Key='$(var.ProgramRegKey)'
- Type='string' Value='[INSTALLDIR]'
- />
- <RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32'
- Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
- />
- <RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgDropHandler)\InProcServer32'
- Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
- />
- <?foreach CLSID in $(var.OverlayCLSIDList) ?>
- <RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32'
- Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
- />
- <?endforeach?>
- </Component>
- <Component Id='CmenuShellRegistrationX86'
- Guid='$(var.CmenuShellRegistrationX86.guid)' Win64='no'>
- <?include $(var.ShellextRepoFolder)/wix/shell-register-cmenu.wxi ?>
- </Component>
- <Component Id='OverlaysShellRegistrationX86'
- Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'>
- <?include $(var.ShellextRepoFolder)/wix/shell-register-overlays.wxi ?>
- </Component>
- <?endif?>
-
<Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'>
<File Id='COPYING' Name='COPYING.txt'
Source='COPYING.txt'
@@ -299,44 +238,6 @@ </Directory>
</Directory>
- <?if $(var.Platform) = "x64" ?>
- <Directory Id="ProgramFilesFolder" Name="Programsx86">
- <Directory Id='INSTALLDIRx86' Name='TortoiseHg'>
- <Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)' Win64='no'>
- <File Id='thgshellx86dll' Name='ThgShellx86.dll' KeyPath='yes'
- Source='../build-shellext/src/ThgShellx86.dll'
- />
- <RegistryValue
- Root='HKLM' Key='$(var.ProgramRegKey)'
- Type='string' Value='[INSTALLDIR]'
- />
- <RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32'
- Type='string' Value='[INSTALLDIRx86]ThgShellx86.dll'
- />
- <RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgDropHandler)\InProcServer32'
- Type='string' Value='[INSTALLDIRx86]ThgShellx86.dll'
- />
- <?foreach CLSID in $(var.OverlayCLSIDList) ?>
- <RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32'
- Type='string' Value='[INSTALLDIRx86]ThgShellx86.dll'
- />
- <?endforeach?>
- </Component>
- <Component Id='CmenuShellRegistrationX86'
- Guid='$(var.CmenuShellRegistrationX86.guid)' Win64='no'>
- <?include $(var.ShellextRepoFolder)/wix/shell-register-cmenu.wxi ?>
- </Component>
- <Component Id='OverlaysShellRegistrationX86'
- Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'>
- <?include $(var.ShellextRepoFolder)/wix/shell-register-overlays.wxi ?>
- </Component>
- </Directory>
- </Directory>
- <?endif?>
-
<?if $(var.Platform) = "x86" ?>
<Merge Id='VCRedist' DiskId='1' Language='1033'
SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm'/>
|
Loading...