##// END OF EJS Templates
rebase: turn rebase revs into set before filtering obsolete...
rebase: turn rebase revs into set before filtering obsolete When the inhibit extension from mutable-history is enabled, it attempts to iterate over the rebaseset to prevent the nodes being rebased from being marked obsolete. This happens at the same time as rebase's _filterobsoleterevs function trying to iterate over the rebaseset to figure out which ones are obsolete. The two of these iterating over the same revset generatorset cause a 'generator already executing' exception. This is probably a flaw in the revset implementation, since iterating over the same set twice should be supported. This regression was introduced in 5d16ebe7b14, since it changed _filterobsoleterevs to be called before the rebaseset was turned into a set(). For now let’s just make the rebaseset an actual set again before calling that function. This was caught by the inhibit tests. The relevant call stack from test-inhibit.t: File "/tmp/hgtests.jgjrN5/install/lib/python/hgext/rebase.py", line 285, in _preparenewrebase obsrevs = _filterobsoleterevs(self.repo, rebaseset) File "/data/hgbuild/facebook-hg-rpms/mutable-history/hgext/inhibit.py", line 197, in _filterobsoleterevswrap r = orig(repo, rebasesetrevs, *args, **kwargs) File "/tmp/hgtests.jgjrN5/install/lib/python/hgext/rebase.py", line 1380, in _filterobsoleterevs return set(r for r in revs if repo[r].obsolete()) File "/tmp/hgtests.jgjrN5/install/lib/python/hgext/rebase.py", line 1380, in <genexpr> return set(r for r in revs if repo[r].obsolete()) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3079, in _iterordered val2 = next(iter2) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3417, in gen yield nextrev() File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3424, in _consumegen for item in self._gen: File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 71, in iterate cl = repo.changelog File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 319, in changelog revs = filterrevs(unfi, self.filtername) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 261, in filterrevs repo.filteredrevcache[filtername] = func(repo.unfiltered()) File "/data/hgbuild/facebook-hg-rpms/mutable-history/hgext/directaccess.py", line 65, in _computehidden hidden = repoview.filterrevs(repo, 'visible') File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 261, in filterrevs repo.filteredrevcache[filtername] = func(repo.unfiltered()) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 175, in computehidden hideable = hideablerevs(repo) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 33, in hideablerevs return obsolete.getrevs(repo, 'obsolete') File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/obsolete.py", line 1097, in getrevs repo.obsstore.caches[name] = cachefuncs[name](repo) File "/data/hgbuild/facebook-hg-rpms/mutable-history/hgext/inhibit.py", line 255, in _computeobsoleteset if getrev(n) not in blacklist: File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3264, in __contains__ return x in self._r1 or x in self._r2 File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3348, in __contains__ for l in self._consumegen(): File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3424, in _consumegen for item in self._gen: ValueError: generator already executing

File last commit:

r23399:fd5247a8 default
r29610:754f6367 stable
Show More
entrypoint.sh
80 lines | 2.1 KiB | application/x-sh | BashLexer
#!/bin/bash
# This script gets executed on container start. Its job is to set up
# the Mercurial environment and invoke the server.
# Mercurial can be started in two modes.
# If the MERCURIAL_SOURCE environment variable is set and it points to a
# Mercurial source directory, we will install Mercurial from that directory.
# Otherwise, we download the Mercurial source and install it manually.
set -e
SOURCE_DIR=/var/hg/source
INSTALL_DIR=/var/hg/install
REPOS_DIR=/var/hg/repos
HTDOCS_DIR=/var/hg/htdocs
if [ ! -d ${SOURCE_DIR} ]; then
echo "Mercurial source not available at ${SOURCE_DIR}"
echo "You need to mount a volume containing the Mercurial source code"
echo "when running the container. For example:"
echo ""
echo " $ docker run -v ~/src/hg:/${SOURCE_DIR} hg-apache"
echo ""
echo "This container will now stop running."
exit 1
fi
echo "Installing Mercurial from ${SOURCE_DIR} into ${INSTALL_DIR}"
pushd ${SOURCE_DIR}
/usr/bin/python2.7 setup.py install --root=/ --prefix=${INSTALL_DIR} --force
popd
mkdir -p ${HTDOCS_DIR}
# Provide a default config if the user hasn't supplied one.
if [ ! -f ${HTDOCS_DIR}/config ]; then
cp /defaulthgwebconfig ${HTDOCS_DIR}/config
fi
if [ ! -f ${HTDOCS_DIR}/hgweb.wsgi ]; then
cat >> ${HTDOCS_DIR}/hgweb.wsgi << EOF
config = '${HTDOCS_DIR}/config'
import sys
sys.path.insert(0, '${INSTALL_DIR}/lib/python2.7/site-packages')
from mercurial import demandimport
demandimport.enable()
from mercurial.hgweb import hgweb
application = hgweb(config)
EOF
fi
mkdir -p ${REPOS_DIR}
if [ ! -d ${REPOS_DIR}/repo ]; then
${INSTALL_DIR}/bin/hg init ${REPOS_DIR}/repo
chown -R www-data:www-data ${REPOS_DIR}/repo
fi
# This is necessary to make debuginstall happy.
if [ ! -f ~/.hgrc ]; then
cat >> ~/.hgrc << EOF
[ui]
username = Dummy User <nobody@example.com>
EOF
fi
echo "Verifying Mercurial installation looks happy"
${INSTALL_DIR}/bin/hg debuginstall
. /etc/apache2/envvars
echo "Starting Apache HTTP Server on port 80"
echo "We hope you remembered to publish this port when running the container!"
echo "If this is an interactive container, simply CTRL^C to stop."
exec "$@"