##// END OF EJS Templates
rebase: allow aborting if last-message.txt is missing...
rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.
Durham Goode -
r31225:749b057b default
Show More
Name Size Modified Last Commit Author
/ contrib / wix
COPYING.rtf Loading ...
README.txt Loading ...
contrib.wxs Loading ...
defines.wxi Loading ...
dist.wxs Loading ...
doc.wxs Loading ...
guids.wxi Loading ...
help.wxs Loading ...
hg.cmd Loading ...
i18n.wxs Loading ...
locale.wxs Loading ...
mercurial.wxs Loading ...
templates.wxs Loading ...

WiX installer source files
==========================

The files in this folder are used by the thg-winbuild [1] package
building architecture to create a Mercurial MSI installer. These files
are versioned within the Mercurial source tree because the WXS files
must kept up to date with distribution changes within their branch. In
other words, the default branch WXS files are expected to diverge from
the stable branch WXS files. Storing them within the same repository is
the only sane way to keep the source tree and the installer in sync.

The MSI installer builder uses only the mercurial.ini file from the
contrib/win32 folder, the contents of which have been historically used
to create an InnoSetup based installer. The rest of the files there are
ignored.

The MSI packages built by thg-winbuild require elevated (admin)
privileges to be installed due to the installation of MSVC CRT libraries
under the C:\WINDOWS\WinSxS folder. Thus the InnoSetup installers may
still be useful to some users.

To build your own MSI packages, clone the thg-winbuild [1] repository
and follow the README.txt [2] instructions closely. There are fewer
prerequisites for a WiX [3] installer than an InnoSetup installer, but
they are more specific.

Direct questions or comments to Steve Borho <steve@borho.org>

[1] http://bitbucket.org/tortoisehg/thg-winbuild
[2] http://bitbucket.org/tortoisehg/thg-winbuild/src/tip/README.txt
[3] http://wix.sourceforge.net/