##// END OF EJS Templates
merge: use separate lists for each action type...
merge: use separate lists for each action type This replaces the grand unified action list that had multiple action types as tuples in one big list. That list was iterated multiple times just to find actions of a specific type. This data model also made some code more convoluted than necessary. Instead we now store actions as a tuple of lists. Using multiple lists gives a bit of cut'n'pasted code but also enables other optimizations. This patch uses 'if True:' to preserve indentations and help reviewing. It also limits the number of conflicts with other pending patches. It can trivially be cleaned up later.

File last commit:

r20315:4dd91c46 stable
r21545:43eecb4e default
Show More
guids.wxi
51 lines | 2.4 KiB | text/plain | TextLexer
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <Include>
<!-- These are component GUIDs used for Mercurial installers.
YOU MUST CHANGE ALL GUIDs below when copying this file
and replace 'Mercurial' in this notice with the name of
your project. Component GUIDs have global namespace! -->
<!-- contrib.wxs -->
Adrian Buehlmann
wix: new GUID for contrib.guid...
r11015 <?define contrib.guid = {F17D27B7-4A6B-4cd2-AE72-FED3CFAA585E} ?>
Steve Borho
wix: add vim syntax file for Mercurial unit tests
r12792 <?define contrib.vim.guid = {BB04903A-652D-4C4F-9590-2BD07A2304F2} ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041 <!-- dist.wxs -->
Adrian Buehlmann
port win32.py to using the Python ctypes library...
r13375 <?define dist.guid = {C3B634A4-1B05-4A40-94A9-38EE853CF693} ?>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <!-- doc.wxs -->
<?define doc.hg.1.html.guid = {AAAA3FDA-EDC5-4220-B59D-D342722358A2} ?>
<?define doc.hgignore.5.html.guid = {AA9118C4-F3A0-4429-A5F4-5A1906B2D67F} ?>
<?define doc.hgrc.5.html = {E0CEA1EB-FA01-408c-844B-EE5965165BAE} ?>
<?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?>
<!-- help.wxs -->
Steve Borho
wix: add phases help text and two more translations (issue 3288)
r16220 <?define helpFolder.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?>
Mads Kiilerich
codingstyle: remove trailing spaces in various text files...
r19023
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <!-- i18n.wxs -->
Steve Borho
wix: add phases help text and two more translations (issue 3288)
r16220 <?define i18nFolder.guid = {1BF8026D-CF7C-4174-AEE6-D6B7BF119248} ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
<!-- templates.wxs -->
Steve Borho
wix: pull in new templates
r20315 <?define templates.root.guid = {437FD55C-7756-4EA0-87E5-FDBE75DC8595} ?>
<?define templates.atom.guid = {D30E14A5-8AF0-4268-8B00-00BEE9E09E39} ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?>
Steve Borho
wix: pick up new template files
r17420 <?define templates.gitweb.guid = {827334AF-1EFD-421B-962C-5660A068F612} ?>
<?define templates.monoblue.guid = {8060A1E4-BD4C-453E-92CB-9536DC44A9E3} ?>
<?define templates.paper.guid = {61AB1DE9-645F-46ED-8AF8-0CF02267FFBB} ?>
Steve Borho
wix: pull in new templates
r20315 <?define templates.raw.guid = {834DF8D7-9784-43A6-851D-A96CE1B3575B} ?>
<?define templates.rss.guid = {9338FA09-E128-4B1C-B723-1142DBD09E14} ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?>
Steve Borho
wix: pull in new templates
r20315 <?define templates.static.guid = {6B3D7C24-98DA-4B67-9F18-35F77357B0B4} ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
Adrian Buehlmann
wix updates...
r10930 <!-- mercurial.wxs -->
<?define ProductUpgradeCode = {A1CC6134-E945-4399-BE36-EB0017FDF7CF} ?>
<?define ComponentMainExecutableGUID = {D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF} ?>
<?define ReadMe.guid = {56A8E372-991D-4DCA-B91D-93D775974CF5} ?>
<?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?>
<?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?>
<?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?>
Steve Borho
wix: add an ssl certificate file to the WiX installers
r13216 <?define paths.rc.guid = {F9ADF21D-5F0B-4934-8CD9-14BE63664721} ?>
<?define cacert.pem.guid = {EC1B2630-FE21-46E6-915B-A6545AF703D4} ?>
Adrian Buehlmann
wix updates...
r10930 <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 </Include>