Mercurial > hg
annotate contrib/wix/guids.wxi @ 22251:d0d3e5c6eb3c
rebase: change "editform" to distinguish merge commits from others
"editform" argument for "getcommiteditor" is decided according to the
format below:
EXTENSION[.COMMAND][.ROUTE]
- EXTENSION: name of extension
- COMMAND: name of command, if there are two or more commands in EXTENSION
- ROUTE: name of route, if there are two or more routes in COMMAND
This patch newly adds "merge" as ROUTE, to distinguish merge commits
from other.
This patch passes bool as "ctxorbool" to "mergeeditform", because
working context has always 2 parents at this point. Dropping the
second parent of non-merging commits is executed in "concludenode".
Unlike other patches in this series (e.g. for "hg commit"), this patch
doesn't add "normal.normal"/"normal.merge" style ROUTEs, because there
is no "merge" case in "collapse" ROUTE.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 16 Aug 2014 10:43:59 +0900 |
parents | 4dd91c466a81 |
children | 5716d10e89e7 |
rev | line source |
---|---|
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
1 <Include> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
2 <!-- These are component GUIDs used for Mercurial installers. |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
3 YOU MUST CHANGE ALL GUIDs below when copying this file |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
4 and replace 'Mercurial' in this notice with the name of |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
5 your project. Component GUIDs have global namespace! --> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
6 |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
7 <!-- contrib.wxs --> |
11015
ee05131ca51a
wix: new GUID for contrib.guid
Adrian Buehlmann <adrian@cadifra.com>
parents:
10930
diff
changeset
|
8 <?define contrib.guid = {F17D27B7-4A6B-4cd2-AE72-FED3CFAA585E} ?> |
12792
0c6c600c03fd
wix: add vim syntax file for Mercurial unit tests
Steve Borho <steve@borho.org>
parents:
12791
diff
changeset
|
9 <?define contrib.vim.guid = {BB04903A-652D-4C4F-9590-2BD07A2304F2} ?> |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
10 |
13041
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
12830
diff
changeset
|
11 <!-- dist.wxs --> |
13375
f1fa8f481c7c
port win32.py to using the Python ctypes library
Adrian Buehlmann <adrian@cadifra.com>
parents:
13216
diff
changeset
|
12 <?define dist.guid = {C3B634A4-1B05-4A40-94A9-38EE853CF693} ?> |
13041
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
12830
diff
changeset
|
13 |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
14 <!-- doc.wxs --> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
15 <?define doc.hg.1.html.guid = {AAAA3FDA-EDC5-4220-B59D-D342722358A2} ?> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
16 <?define doc.hgignore.5.html.guid = {AA9118C4-F3A0-4429-A5F4-5A1906B2D67F} ?> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
17 <?define doc.hgrc.5.html = {E0CEA1EB-FA01-408c-844B-EE5965165BAE} ?> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
18 <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
19 |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
20 <!-- help.wxs --> |
16220
939f043ab5ed
wix: add phases help text and two more translations (issue 3288)
Steve Borho <steve@borho.org>
parents:
15764
diff
changeset
|
21 <?define helpFolder.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?> |
19023
86531a7038ed
codingstyle: remove trailing spaces in various text files
Mads Kiilerich <madski@unity3d.com>
parents:
17420
diff
changeset
|
22 |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
23 <!-- i18n.wxs --> |
16220
939f043ab5ed
wix: add phases help text and two more translations (issue 3288)
Steve Borho <steve@borho.org>
parents:
15764
diff
changeset
|
24 <?define i18nFolder.guid = {1BF8026D-CF7C-4174-AEE6-D6B7BF119248} ?> |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
25 |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
26 <!-- templates.wxs --> |
20315 | 27 <?define templates.root.guid = {437FD55C-7756-4EA0-87E5-FDBE75DC8595} ?> |
28 <?define templates.atom.guid = {D30E14A5-8AF0-4268-8B00-00BEE9E09E39} ?> | |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
29 <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?> |
17420
d79df9fd5374
wix: pick up new template files
Steve Borho <steve@borho.org>
parents:
16220
diff
changeset
|
30 <?define templates.gitweb.guid = {827334AF-1EFD-421B-962C-5660A068F612} ?> |
d79df9fd5374
wix: pick up new template files
Steve Borho <steve@borho.org>
parents:
16220
diff
changeset
|
31 <?define templates.monoblue.guid = {8060A1E4-BD4C-453E-92CB-9536DC44A9E3} ?> |
d79df9fd5374
wix: pick up new template files
Steve Borho <steve@borho.org>
parents:
16220
diff
changeset
|
32 <?define templates.paper.guid = {61AB1DE9-645F-46ED-8AF8-0CF02267FFBB} ?> |
20315 | 33 <?define templates.raw.guid = {834DF8D7-9784-43A6-851D-A96CE1B3575B} ?> |
34 <?define templates.rss.guid = {9338FA09-E128-4B1C-B723-1142DBD09E14} ?> | |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
35 <?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?> |
20315 | 36 <?define templates.static.guid = {6B3D7C24-98DA-4B67-9F18-35F77357B0B4} ?> |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
37 |
10930 | 38 <!-- mercurial.wxs --> |
39 <?define ProductUpgradeCode = {A1CC6134-E945-4399-BE36-EB0017FDF7CF} ?> | |
40 | |
41 <?define ComponentMainExecutableGUID = {D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF} ?> | |
42 | |
43 <?define ReadMe.guid = {56A8E372-991D-4DCA-B91D-93D775974CF5} ?> | |
44 <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?> | |
45 <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?> | |
46 <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?> | |
13216
e5c2338d76b5
wix: add an ssl certificate file to the WiX installers
Steve Borho <steve@borho.org>
parents:
13041
diff
changeset
|
47 <?define paths.rc.guid = {F9ADF21D-5F0B-4934-8CD9-14BE63664721} ?> |
e5c2338d76b5
wix: add an ssl certificate file to the WiX installers
Steve Borho <steve@borho.org>
parents:
13041
diff
changeset
|
48 <?define cacert.pem.guid = {EC1B2630-FE21-46E6-915B-A6545AF703D4} ?> |
10930 | 49 <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?> |
50 | |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
51 </Include> |