##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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.
Steven Stallion - - Load All Authors

File last commit:

r16556:f9262456 stable
r31225:749b057b default
Show More
mkfile
37 lines | 742 B | text/plain | TextLexer
/ contrib / plan9 / mkfile
History | Source | Raw |Copy content |Copy permalink
Steven Stallion
plan9: initial support for plan 9 from bell labs...
 r16383 APE=/sys/src/ape
<$APE/config
PYTHON=python
PYTHONBIN=/rc/bin
SH=ape/psh
PURE=--pure
ROOT=../..
# This is slightly underhanded; Plan 9 does not support GNU gettext nor
# does it support dynamically loaded extension modules. We work around
# this by calling build_py and build_scripts directly; this avoids
# additional platform hacks in setup.py.
build:VQ:
@{
cd $ROOT
$SH -c '$PYTHON setup.py $PURE build_py build_scripts'
}
clean:VQ:
@{
cd $ROOT
$SH -c '$PYTHON setup.py $PURE clean --all'
}
install:VQ: build
@{
cd $ROOT
$SH -c '$PYTHON setup.py $PURE install \
--install-scripts $PYTHONBIN \
Steven Stallion
plan9: mkfile and 9diff fixes...
 r16556 --skip-build \
--force'
Steven Stallion
plan9: initial support for plan 9 from bell labs...
 r16383 }
mkdir -p /lib/mercurial/hgrc.d
Steven Stallion
plan9: mkfile and 9diff fixes...
 r16556 dircp hgrc.d /lib/mercurial/hgrc.d/
cp 9diff /rc/bin/