##// 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 / python-zstandard / zstd / common
bitstream.h Loading ...
entropy_common.c Loading ...
error_private.c Loading ...
error_private.h Loading ...
fse.h Loading ...
fse_decompress.c Loading ...
huf.h Loading ...
mem.h Loading ...
pool.c Loading ...
pool.h Loading ...
threading.c Loading ...
threading.h Loading ...
xxhash.c Loading ...
xxhash.h Loading ...
zstd_common.c Loading ...
zstd_errors.h Loading ...
zstd_internal.h Loading ...