branching: merge with stable

contrib/packaging/inno/readme.rst

@@ -1,61 +1,61
 Requirements
 ============
 
 Building the Inno installer requires a Windows machine.
 
 The following system dependencies must be installed:
 
 * Python 2.7 (download from https://www.python.org/downloads/)
 * Microsoft Visual C++ Compiler for Python 2.7
   (https://www.microsoft.com/en-us/download/details.aspx?id=44266)
 * Inno Setup (http://jrsoftware.org/isdl.php) version 5.4 or newer.
   Be sure to install the optional Inno Setup Preprocessor feature,
   which is required.
 * Python 3.5+ (to run the ``packaging.py`` script)
 
 Building
 ========
 
 The ``packaging.py`` script automates the process of producing an
 Inno installer. It manages fetching and configuring the
 non-system dependencies (such as py2exe, gettext, and various
 Python packages).
 
 The script requires an activated ``Visual C++ 2008`` command prompt.
 A shortcut to such a prompt was installed with ``Microsoft Visual C++
 Compiler for Python 2.7``. From your Start Menu, look for
 ``Microsoft Visual C++ Compiler Package for Python 2.7`` then launch
 either ``Visual C++ 2008 32-bit Command Prompt`` or
 ``Visual C++ 2008 64-bit Command Prompt``.
 
 From the prompt, change to the Mercurial source directory. e.g.
 ``cd c:\src\hg``.
 
 Next, invoke ``packaging.py`` to produce an Inno installer. You will
 need to supply the path to the Python interpreter to use.::
 
-   $ python3.exe contrib\packaging\packaging.py \
+   $ py -3 contrib\packaging\packaging.py \
        inno --python c:\python27\python.exe
 
 .. note::
 
    The script validates that the Visual C++ environment is
    active and that the architecture of the specified Python
    interpreter matches the Visual C++ environment and errors
    if not.
 
 If everything runs as intended, dependencies will be fetched and
 configured into the ``build`` sub-directory, Mercurial will be built,
 and an installer placed in the ``dist`` sub-directory. The final
 line of output should print the name of the generated installer.
 
 Additional options may be configured. Run
 ``packaging.py inno --help`` to see a list of program flags.
 
 MinGW
 =====
 
 It is theoretically possible to generate an installer that uses
 MinGW. This isn't well tested and ``packaging.py`` and may properly
 support it. See old versions of this file in version control for
 potentially useful hints as to how to achieve this.

contrib/packaging/wix/mercurial.wxs

@@ -1,152 +1,153
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 
   <!-- Copyright 2010 Steve Borho <[e-mail]>
 
   This software may be used and distributed according to the terms of the
   GNU General Public License version 2 or any later version. -->
 
   <?include guids.wxi ?>
   <?include defines.wxi ?>
 
   <?if $(var.Platform) = "x64" ?>
     <?define PFolder = ProgramFiles64Folder ?>
   <?else?>
     <?define PFolder = ProgramFilesFolder ?>
   <?endif?>
 
   <Product Id='*'
     Name='Mercurial $(var.Version) ($(var.Platform))'
     UpgradeCode='$(var.ProductUpgradeCode)'
     Language='1033' Codepage='1252' Version='$(var.Version)'
     Manufacturer='Matt Mackall and others'>
 
     <Package Id='*'
       Keywords='Installer'
       Description="Mercurial distributed SCM (version $(var.Version))"
       Comments='$(var.Comments)'
       Platform='$(var.Platform)'
       Manufacturer='Matt Mackall and others'
       InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
 
     <Media Id='1' Cabinet='mercurial.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'
            CompressionLevel='high' />
     <Property Id='DiskPrompt' Value="Mercurial $(var.Version) Installation [1]" />
 
     <Condition Message='Mercurial MSI installers require Windows XP or higher'>
         VersionNT >= 501
     </Condition>
 
     <Property Id="INSTALLDIR">
       <ComponentSearch Id='SearchForMainExecutableComponent'
-                       Guid='$(var.ComponentMainExecutableGUID)' />
+                       Guid='$(var.ComponentMainExecutableGUID)'
+                       Type='directory' />
     </Property>
 
     <!--Property Id='ARPCOMMENTS'>any comments</Property-->
     <Property Id='ARPCONTACT'>[e-mail]</Property>
     <Property Id='ARPHELPLINK'>https://mercurial-scm.org/wiki/</Property>
     <Property Id='ARPURLINFOABOUT'>https://mercurial-scm.org/about/</Property>
     <Property Id='ARPURLUPDATEINFO'>https://mercurial-scm.org/downloads/</Property>
     <Property Id='ARPHELPTELEPHONE'>https://mercurial-scm.org/wiki/Support</Property>
     <Property Id='ARPPRODUCTICON'>hgIcon.ico</Property>
 
     <Property Id='INSTALLEDMERCURIALPRODUCTS' Secure='yes'></Property>
     <Property Id='REINSTALLMODE'>amus</Property>
 
     <!--Auto-accept the license page-->
     <Property Id='LicenseAccepted'>1</Property>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='$(var.PFolder)' Name='PFiles'>
         <Directory Id='INSTALLDIR' Name='Mercurial'>
           <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)' Win64='$(var.IsX64)'>
             <CreateFolder />
             <Environment Id="Environment" Name="PATH" Part="last" System="yes"
                          Permanent="no" Value="[INSTALLDIR]" Action="set" />
           </Component>
         </Directory>
       </Directory>
 
       <Directory Id="ProgramMenuFolder" Name="Programs">
         <Directory Id="ProgramMenuDir" Name="Mercurial $(var.Version)">
           <Component Id="ProgramMenuDir" Guid="$(var.ProgramMenuDir.guid)" Win64='$(var.IsX64)'>
             <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
             <RegistryValue Root='HKCU' Key='Software\Mercurial\InstallDir' Type='string'
                            Value='[INSTALLDIR]' KeyPath='yes' />
             <Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='Mercurial Web Site'
                       Target='[ARPHELPLINK]' Icon="hgIcon.ico" IconIndex='0' />
           </Component>
         </Directory>
       </Directory>
 
       <!-- Install VCRedist merge modules on Python 2. On Python 3,
            vcruntimeXXX.dll is part of the install layout and gets picked up
            as a regular file. -->
       <?if $(var.PythonVersion) = "2" ?>
         <?if $(var.Platform) = "x86" ?>
           <Merge Id='VCRuntime' DiskId='1' Language='1033'
                 SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' />
           <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033'
                 SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' />
         <?else?>
           <Merge Id='VCRuntime' DiskId='1' Language='1033'
                 SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x64_msm.msm' />
           <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033'
                 SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x64_msm.msm' />
         <?endif?>
       <?endif?>
     </Directory>
 
     <Feature Id='Complete' Title='Mercurial' Description='The complete package'
         Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
       <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app'
              Level='1' Absent='disallow' >
         <ComponentRef Id='MainExecutable' />
         <ComponentRef Id='ProgramMenuDir' />
         <ComponentGroupRef Id="hg.group.ROOT" />
         <ComponentGroupRef Id="hg.group.defaultrc" />
         <ComponentGroupRef Id="hg.group.helptext" />
         <?ifdef MercurialHasLib?>
           <ComponentGroupRef Id="hg.group.lib" />
         <?endif?>
         <ComponentGroupRef Id="hg.group.templates" />
         <?if $(var.PythonVersion) = "2" ?>
           <MergeRef Id='VCRuntime' />
           <MergeRef Id='VCRuntimePolicy' />
         <?endif?>
       </Feature>
       <?ifdef MercurialExtraFeatures?>
         <?foreach EXTRAFEAT in $(var.MercurialExtraFeatures)?>
           <FeatureRef Id="$(var.EXTRAFEAT)" />
         <?endforeach?>
       <?endif?>
       <Feature Id='Locales' Title='Translations' Description='Translations' Level='1'>
         <ComponentGroupRef Id="hg.group.locale" />
       </Feature>
       <Feature Id='Documentation' Title='Documentation' Description='HTML man pages' Level='1'>
         <ComponentGroupRef Id="hg.group.doc" />
       </Feature>
       <Feature Id='Misc' Title='Miscellaneous' Description='Contributed scripts' Level='1'>
         <ComponentGroupRef Id="hg.group.contrib" />
       </Feature>
     </Feature>
 
     <UIRef Id="WixUI_FeatureTree" />
     <UIRef Id="WixUI_ErrorProgressText" />
 
     <WixVariable Id="WixUILicenseRtf" Value="contrib\packaging\wix\COPYING.rtf" />
 
     <Icon Id="hgIcon.ico" SourceFile="contrib/win32/mercurial.ico" />
 
     <Upgrade Id='$(var.ProductUpgradeCode)'>
       <UpgradeVersion
         IncludeMinimum='yes' Minimum='0.0.0' IncludeMaximum='no' OnlyDetect='no'
         Property='INSTALLEDMERCURIALPRODUCTS' />
     </Upgrade>
 
     <InstallExecuteSequence>
       <RemoveExistingProducts After='InstallInitialize'/>
     </InstallExecuteSequence>
 
   </Product>
 </Wix>

contrib/packaging/wix/readme.rst

@@ -1,71 +1,71
 WiX Installer
 =============
 
 The files in this directory are used to produce an MSI installer using
 the WiX Toolset (http://wixtoolset.org/).
 
 The MSI installers require elevated (admin) privileges due to the
 installation of MSVC CRT libraries into the Windows system store. See
 the Inno Setup installers in the ``inno`` sibling directory for installers
 that do not have this requirement.
 
 Requirements
 ============
 
 Building the WiX installers requires a Windows machine. The following
 dependencies must be installed:
 
 * Python 2.7 (download from https://www.python.org/downloads/)
 * Microsoft Visual C++ Compiler for Python 2.7
   (https://www.microsoft.com/en-us/download/details.aspx?id=44266)
 * Python 3.5+ (to run the ``packaging.py`` script)
 
 Building
 ========
 
 The ``packaging.py`` script automates the process of producing an MSI
 installer. It manages fetching and configuring non-system dependencies
 (such as py2exe, gettext, and various Python packages).
 
 The script requires an activated ``Visual C++ 2008`` command prompt.
 A shortcut to such a prompt was installed with ``Microsoft Visual
 C++ Compiler for Python 2.7``. From your Start Menu, look for
 ``Microsoft Visual C++ Compiler Package for Python 2.7`` then
 launch either ``Visual C++ 2008 32-bit Command Prompt`` or
 ``Visual C++ 2008 64-bit Command Prompt``.
 
 From the prompt, change to the Mercurial source directory. e.g.
 ``cd c:\src\hg``.
 
 Next, invoke ``packaging.py`` to produce an MSI installer. You will need
 to supply the path to the Python interpreter to use.::
 
-   $ python3 contrib\packaging\packaging.py \
+   $ py -3 contrib\packaging\packaging.py \
       wix --python c:\python27\python.exe
 
 .. note::
 
    The script validates that the Visual C++ environment is active and
    that the architecture of the specified Python interpreter matches the
    Visual C++ environment. An error is raised otherwise.
 
 If everything runs as intended, dependencies will be fetched and
 configured into the ``build`` sub-directory, Mercurial will be built,
 and an installer placed in the ``dist`` sub-directory. The final line
 of output should print the name of the generated installer.
 
 Additional options may be configured. Run ``packaging.py wix --help`` to
 see a list of program flags.
 
 Relationship to TortoiseHG
 ==========================
 
 TortoiseHG uses the WiX files in this directory.
 
 The code for building TortoiseHG installers lives at
 https://bitbucket.org/tortoisehg/thg-winbuild and is maintained by
 Steve Borho ([e-mail]).
 
 When changing behavior of the WiX installer, be sure to notify
 the TortoiseHG Project of the changes so they have ample time
 provide feedback and react to those changes.

relnotes/5.7

@@ -1,72 +1,76
 == New Features ==
 
  * There is a new config section for templates used by hg commands. It
    is called `[command-templates]`. Some existing config options have
    been deprecated in favor of config options in the new
    section. These are: `ui.logtemplate` to `command-templates.log`,
    `ui.graphnodetemplate` to `command-templates.graphnode`,
    `ui.mergemarkertemplate` to `command-templates.mergemarker`,
    `ui.pre-merge-tool-output-template` to
    `command-templates.pre-merge-tool-output`.
 
  * There is a new set of config options for the template used for the
    one-line commit summary displayed by various commands, such as `hg
    rebase`. The main one is `command-templates.oneline-summary`. That
    can be overridden per command with
    `command-templates.oneline-summary.<command>`, where `<command>`
    can be e.g. `rebase`. As part of this effort, the default format
    from `hg rebase` was reorganized a bit.
 
  * `hg purge` is now a core command using `--confirm` by default.
 
  * `hg strip`, from the strip extension, is now a core command, `hg
    debugstrip`. The extension remains for compatibility.
 
  * `hg diff` and `hg extdiff` now support `--from <rev>` and `--to <rev>`
    arguments as clearer alternatives to `-r <revs>`. `-r <revs>` has been
    deprecated.
 
  * The memory footprint per changeset during pull/unbundle
    operations has been further reduced.
 
  * There is a new internal merge tool called `internal:mergediff` (can
    be set as the value for the `merge` config in the `[ui]`
    section). It resolves merges the same was as `internal:merge` and
    `internal:merge3`, but it shows conflicts differently. Instead of
    showing 2 or 3 snapshots of the conflicting pieces of code, it
    shows one snapshot and a diff. This may be useful when at least one
    side of the conflict is similar to the base. The new marker style
    is also supported by "premerge" as
    `merge-tools.<tool>.premerge=keep-mergediff`.
 
- * External hooks are now called with `HGPLAIN=1` preset.
+ * External hooks are now called with `HGPLAIN=1` preset.  This has the side
+   effect of ignoring aliases, templates, revsetaliases, and a few other config
+   options in any `hg` command spawned by the hook.  The previous behavior
+   can be restored by setting HGPLAINEXCEPT appropriately in the parent process.
+   See `hg help environment` for the list of items, and how to set it.
 
  * The `branchmap` cache is updated more intelligently and can be
    significantly faster for repositories with many branches and changesets.
 
  * The `rev-branch-cache` is now updated incrementally whenever changesets
    are added.
 
 
 == New Experimental Features ==
 
 * `experimental.single-head-per-branch:public-changes-only` can be used
   restrict the single head check to public revision. This is useful for
   overlay repository that have both a publishing and non-publishing view
   of the same storage.
 
 
 == Bug Fixes ==
 
 
 
 == Backwards Compatibility Changes ==
 
  * `--force-lock` and `--force-wlock` options on `hg debuglock` command are
    renamed to `--force-free-lock` and `--force-free-wlock` respectively.
 
 
 == Internal API Changes ==
 
  * `changelog.branchinfo` is deprecated and will be removed after 5.8.
    It is superseded by `changelogrevision.branchinfo`.

relnotes/next

@@ -1,72 +1,22
 == New Features ==
-
- * There is a new config section for templates used by hg commands. It
-   is called `[command-templates]`. Some existing config options have
-   been deprecated in favor of config options in the new
-   section. These are: `ui.logtemplate` to `command-templates.log`,
-   `ui.graphnodetemplate` to `command-templates.graphnode`,
-   `ui.mergemarkertemplate` to `command-templates.mergemarker`,
-   `ui.pre-merge-tool-output-template` to
-   `command-templates.pre-merge-tool-output`.
-
- * There is a new set of config options for the template used for the
-   one-line commit summary displayed by various commands, such as `hg
-   rebase`. The main one is `command-templates.oneline-summary`. That
-   can be overridden per command with
-   `command-templates.oneline-summary.<command>`, where `<command>`
-   can be e.g. `rebase`. As part of this effort, the default format
-   from `hg rebase` was reorganized a bit.
-
+ 
  * `hg purge` is now a core command using `--confirm` by default.
-
- * `hg strip`, from the strip extension, is now a core command, `hg
-   debugstrip`. The extension remains for compatibility.
-
- * `hg diff` and `hg extdiff` now support `--from <rev>` and `--to <rev>`
-   arguments as clearer alternatives to `-r <revs>`. `-r <revs>` has been
-   deprecated.
-
- * The memory footprint per changeset during pull/unbundle
-   operations has been further reduced.
-
- * There is a new internal merge tool called `internal:mergediff` (can
-   be set as the value for the `merge` config in the `[ui]`
-   section). It resolves merges the same was as `internal:merge` and
-   `internal:merge3`, but it shows conflicts differently. Instead of
-   showing 2 or 3 snapshots of the conflicting pieces of code, it
-   shows one snapshot and a diff. This may be useful when at least one
-   side of the conflict is similar to the base. The new marker style
-   is also supported by "premerge" as
-   `merge-tools.<tool>.premerge=keep-mergediff`.
-
- * External hooks are now called with `HGPLAIN=1` preset.
-
- * The `branchmap` cache is updated more intelligently and can be
-   significantly faster for repositories with many branches and changesets.
-
+ 
  * The `rev-branch-cache` is now updated incrementally whenever changesets
    are added.
 
 
 == New Experimental Features ==
 
-* `experimental.single-head-per-branch:public-changes-only` can be used
-  restrict the single head check to public revision. This is useful for
-  overlay repository that have both a publishing and non-publishing view
-  of the same storage.
-
 
 == Bug Fixes ==
 
 
 
 == Backwards Compatibility Changes ==
 
- * `--force-lock` and `--force-wlock` options on `hg debuglock` command are
-   renamed to `--force-free-lock` and `--force-free-wlock` respectively.
-
 
 == Internal API Changes ==
 
  * `changelog.branchinfo` is deprecated and will be removed after 5.8.
    It is superseded by `changelogrevision.branchinfo`.