##// 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.

File last commit:

r30895:c32454d6 default
r31225:749b057b default
Show More
setup_zstd.py
96 lines | 2.5 KiB | text/x-python | PythonLexer
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435 # Copyright (c) 2016-present, Gregory Szorc
# All rights reserved.
#
# This software may be modified and distributed under the terms
# of the BSD license. See the LICENSE file for details.
import os
from distutils.extension import Extension
zstd_sources = ['zstd/%s' % p for p in (
'common/entropy_common.c',
'common/error_private.c',
'common/fse_decompress.c',
Gregory Szorc
zstd: vendor python-zstandard 0.7.0...
r30895 'common/pool.c',
'common/threading.c',
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435 'common/xxhash.c',
'common/zstd_common.c',
'compress/fse_compress.c',
'compress/huf_compress.c',
'compress/zstd_compress.c',
'decompress/huf_decompress.c',
'decompress/zstd_decompress.c',
Gregory Szorc
zstd: vendor python-zstandard 0.7.0...
r30895 'dictBuilder/cover.c',
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435 'dictBuilder/divsufsort.c',
'dictBuilder/zdict.c',
)]
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
r30822 zstd_sources_legacy = ['zstd/%s' % p for p in (
Gregory Szorc
zstd: vendor python-zstandard 0.7.0...
r30895 'deprecated/zbuff_common.c',
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
r30822 'deprecated/zbuff_compress.c',
'deprecated/zbuff_decompress.c',
'legacy/zstd_v01.c',
'legacy/zstd_v02.c',
'legacy/zstd_v03.c',
'legacy/zstd_v04.c',
'legacy/zstd_v05.c',
'legacy/zstd_v06.c',
'legacy/zstd_v07.c'
)]
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435
zstd_includes = [
'c-ext',
'zstd',
'zstd/common',
'zstd/compress',
'zstd/decompress',
'zstd/dictBuilder',
]
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
r30822 zstd_includes_legacy = [
'zstd/deprecated',
'zstd/legacy',
]
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435 ext_sources = [
'zstd.c',
'c-ext/compressiondict.c',
'c-ext/compressobj.c',
'c-ext/compressor.c',
'c-ext/compressoriterator.c',
'c-ext/compressionparams.c',
'c-ext/compressionwriter.c',
'c-ext/constants.c',
'c-ext/decompressobj.c',
'c-ext/decompressor.c',
'c-ext/decompressoriterator.c',
'c-ext/decompressionwriter.c',
'c-ext/dictparams.c',
Gregory Szorc
zstd: vendor python-zstandard 0.7.0...
r30895 'c-ext/frameparams.c',
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435 ]
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
r30822 zstd_depends = [
'c-ext/python-zstandard.h',
]
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
r30822
def get_c_extension(support_legacy=False, name='zstd'):
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435 """Obtain a distutils.extension.Extension for the C extension."""
root = os.path.abspath(os.path.dirname(__file__))
sources = [os.path.join(root, p) for p in zstd_sources + ext_sources]
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
r30822 if support_legacy:
sources.extend([os.path.join(root, p) for p in zstd_sources_legacy])
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435 include_dirs = [os.path.join(root, d) for d in zstd_includes]
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
r30822 if support_legacy:
include_dirs.extend([os.path.join(root, d) for d in zstd_includes_legacy])
depends = [os.path.join(root, p) for p in zstd_depends]
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435
# TODO compile with optimizations.
return Extension(name, sources,
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
r30822 include_dirs=include_dirs,
depends=depends,
extra_compile_args=["-DZSTD_LEGACY_SUPPORT=1"] if support_legacy else [])