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

r23399:fd5247a8 default
r31225:749b057b default
Show More
Dockerfile
23 lines | 520 B | text/x-dockerfile-config | DockerLexer
FROM debian:wheezy
ENV DEBIAN_FRONTEND noninteractive
ENV WSGI_PROCESSES 4
ENV WSGI_THREADS 1
ENV WSGI_MAX_REQUESTS 100000
EXPOSE 80
VOLUME ["/var/hg/htdocs", "/var/hg/repos"]
RUN apt-get update && apt-get -y install libapache2-mod-wsgi python-dev vim
# Install our own Apache site.
RUN a2dissite 000-default
ADD vhost.conf /etc/apache2/sites-available/hg
RUN a2ensite hg
ADD hgwebconfig /defaulthgwebconfig
ADD entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
CMD ["/usr/sbin/apache2", "-DFOREGROUND"]