contrib/wix/guids.wxi
author Gregory Szorc <gregory.szorc@gmail.com>
Tue, 18 Sep 2018 15:15:24 -0700
changeset 39763 5ccd791344f3
parent 33581 e12c3049af8e
permissions -rw-r--r--
localrepo: pass root manifest into manifestlog.__init__ Today, localrepository has a method that can be overloaded which returns an instance of the root manifest storage object. When a manifestlog is created, it calls this private method and stores the root manifest object on it. This "hook" on localrepository isn't part of the documented interface. It isn't compatible with our desire to make repo storage determined before the repo object is constructed. This commit changes manifestlog.__init__ to accept the root storage object instead of calling into the repo to construct it. By doing things this way, the repo instance is responsible for constructing the manifest storage object directly. This does mean that other derived repo types need to overload manifestlog(). But they should have been doing this already, as manifestlog() is typically decorated in a storage-specific way. e.g. localrepository.manifestlog() is decorated as @storecache('00manifest.i'). And this assumes that a 00manifest.i file exists in the store vfs. This condition may not hold for repository types using non-revlog storage. So it is important for special repo types to override manifestlog() to remove this file association. The code changed in perf is wrong because it isn't compatible with older Mercurial versions. But I'm pretty sure the code was broken on older versions before this commit. It only affects `hg perftags`. I don't care enough to fix that at this time. .. api:: ``manifest.manifestlog.__init__()`` now receives the root manifest storage instance instead of calling into a private method on the repo object to obtain it. Differential Revision: https://phab.mercurial-scm.org/D4641
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 -->
22445
5716d10e89e7 wix: contrib/sample.hgrc is no more
Steve Borho <steve@borho.org>
parents: 20315
diff changeset
     8
  <?define contrib.guid = {4E11FFC2-E2F7-482A-8460-9394B5489F02} ?>
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 -->
25409
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 24989
diff changeset
    12
  <?define dist.guid = {CE405FE6-CD1E-4873-9C9A-7683AE5A3D90} ?>
33581
e12c3049af8e wix: update list of necessary pyd files
Steve Borho <steve@borho.org>
parents: 27684
diff changeset
    13
  <?define lib.guid = {877633b5-0b7e-4b46-8f1c-224a61733297} ?>
13041
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents: 12830
diff changeset
    14
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
    15
  <!-- doc.wxs -->
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
    16
  <?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
    17
  <?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
    18
  <?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
    19
  <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
    20
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
    21
  <!-- help.wxs -->
27684
e9857fbfd072 wix: add help for current internal topics
Matt Harbison <matt_harbison@yahoo.com>
parents: 25409
diff changeset
    22
  <?define help.root.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?>
e9857fbfd072 wix: add help for current internal topics
Matt Harbison <matt_harbison@yahoo.com>
parents: 25409
diff changeset
    23
  <?define help.internals.guid = {2DD7669D-0DB8-4C39-9806-78E6475E7ACC} ?>
19023
86531a7038ed codingstyle: remove trailing spaces in various text files
Mads Kiilerich <madski@unity3d.com>
parents: 17420
diff changeset
    24
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
    25
  <!-- i18n.wxs -->
16220
939f043ab5ed wix: add phases help text and two more translations (issue 3288)
Steve Borho <steve@borho.org>
parents: 15764
diff changeset
    26
  <?define i18nFolder.guid = {1BF8026D-CF7C-4174-AEE6-D6B7BF119248} ?>
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
    27
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
    28
  <!-- templates.wxs -->
20315
4dd91c466a81 wix: pull in new templates
Steve Borho <steve@borho.org>
parents: 19023
diff changeset
    29
  <?define templates.root.guid = {437FD55C-7756-4EA0-87E5-FDBE75DC8595} ?>
4dd91c466a81 wix: pull in new templates
Steve Borho <steve@borho.org>
parents: 19023
diff changeset
    30
  <?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
    31
  <?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
    32
  <?define templates.gitweb.guid = {827334AF-1EFD-421B-962C-5660A068F612} ?>
24989
3098dcd2d167 wix: add new json templates folder to MSI installers
Steve Borho <steve@borho.org>
parents: 24839
diff changeset
    33
  <?define templates.json.guid = {F535BE7A-EC34-46E0-B9BE-013F3DBAFB19} ?>
17420
d79df9fd5374 wix: pick up new template files
Steve Borho <steve@borho.org>
parents: 16220
diff changeset
    34
  <?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
    35
  <?define templates.paper.guid = {61AB1DE9-645F-46ED-8AF8-0CF02267FFBB} ?>
20315
4dd91c466a81 wix: pull in new templates
Steve Borho <steve@borho.org>
parents: 19023
diff changeset
    36
  <?define templates.raw.guid = {834DF8D7-9784-43A6-851D-A96CE1B3575B} ?>
4dd91c466a81 wix: pull in new templates
Steve Borho <steve@borho.org>
parents: 19023
diff changeset
    37
  <?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
    38
  <?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?>
20315
4dd91c466a81 wix: pull in new templates
Steve Borho <steve@borho.org>
parents: 19023
diff changeset
    39
  <?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
    40
10930
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    41
  <!-- mercurial.wxs -->
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    42
  <?define ProductUpgradeCode = {A1CC6134-E945-4399-BE36-EB0017FDF7CF} ?>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    43
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    44
  <?define ComponentMainExecutableGUID = {D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF} ?>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    45
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    46
  <?define ReadMe.guid = {56A8E372-991D-4DCA-B91D-93D775974CF5} ?>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    47
  <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    48
  <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    49
  <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    50
  <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    51
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
    52
</Include>