Mercurial > hg-stable
view contrib/wix/doc.wxs @ 41298:88a7c211b21e stable
narrow: fix crash when restoring backup in legacy repo
Using --addremove when committing in an old repo (before we started
keeping .hg/narrowspec.dirstate) results in a crash. The test
case modified in this patch would crash like this:
abort: $ENOENT$
The issue is that when the dirstateguard is aborted, it tries to
restore the backup of .hg/narrowspec.dirstate. However, since we were
in an old repo, that file did not get created when the dirstateguard
was created. Note that the dirstateguard is not used unless
--addremove is passed.
This patch fixes the bug by making restorewcbackup() not fail if the
backup doesn't exist. I also made clearwcbackup() safe, just in case.
Differential Revision: https://phab.mercurial-scm.org/D5634
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 18 Jan 2019 23:32:26 -0800 |
parents | bd9bc4123920 |
children |
line wrap: on
line source
<?xml version="1.0" encoding="utf-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?include guids.wxi ?> <?include defines.wxi ?> <Fragment> <ComponentGroup Id="docFolder"> <ComponentRef Id="doc.hg.1.html" /> <ComponentRef Id="doc.hgignore.5.html" /> <ComponentRef Id="doc.hgrc.5.html" /> <ComponentRef Id="doc.style.css" /> </ComponentGroup> </Fragment> <Fragment> <DirectoryRef Id="INSTALLDIR"> <Directory Id="docdir" Name="doc" FileSource="$(var.SourceDir)"> <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)" Win64='$(var.IsX64)'> <File Name="hg.1.html" KeyPath="yes"> <Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir" Name="Mercurial Command Reference" Icon="hgIcon.ico" IconIndex="0" Advertise="yes" /> </File> </Component> <Component Id="doc.hgignore.5.html" Guid="$(var.doc.hgignore.5.html.guid)" Win64='$(var.IsX64)'> <File Name="hgignore.5.html" KeyPath="yes"> <Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir" Name="Mercurial Ignore Files" Icon="hgIcon.ico" IconIndex="0" Advertise="yes" /> </File> </Component> <Component Id="doc.hgrc.5.html" Guid="$(var.doc.hgrc.5.html)" Win64='$(var.IsX64)'> <File Name="hgrc.5.html" KeyPath="yes"> <Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir" Name="Mercurial Configuration Files" Icon="hgIcon.ico" IconIndex="0" Advertise="yes" /> </File> </Component> <Component Id="doc.style.css" Guid="$(var.doc.style.css)" Win64='$(var.IsX64)'> <File Name="style.css" KeyPath="yes" /> </Component> </Directory> </DirectoryRef> </Fragment> </Wix>