diff --git a/run-cleanup.sh b/run-cleanup.sh index 77c7860..47d562d 100755 --- a/run-cleanup.sh +++ b/run-cleanup.sh @@ -31,10 +31,11 @@ if ! /bin/bash "${SETUP_MERCURIAL}"; then exit 2 fi source "${VIRTUALENV}/bin/activate" - # Disable all extensions. # (https://stackoverflow.com/questions/46612210/mercurial-disable-all-the-extensions-from-the-command-line) -HGRCPATH= HGPLAIN= \ +export HGRCPATH= +export HGPLAIN= + hg \ --config extensions.renaming_mercurial_source="${BASE}/renaming_mercurial_source.py" \ --config extensions.hgext.convert= \ @@ -47,7 +48,5 @@ hg \ --branchmap "${BASE}/data/downward_branchmap.txt" cd "${CLEANED_REPOSITORY}" -HGRCPATH= HGPLAIN= \ hg --config extensions.strip= strip "branch(issue323)" --nobackup -HGRCPATH= HGPLAIN= \ hg --config extensions.strip= strip "branch(ipc-2011-fixes)" --nobackup diff --git a/run-order.sh b/run-order.sh index 2b87c5a..40fae42 100755 --- a/run-order.sh +++ b/run-order.sh @@ -31,18 +31,16 @@ if ! /bin/bash "${SETUP_MERCURIAL}"; then exit 2 fi source "${VIRTUALENV}/bin/activate" - # Disable all extensions. # (https://stackoverflow.com/questions/46612210/mercurial-disable-all-the-extensions-from-the-command-line) -HGRCPATH= HGPLAIN= \ +export HGRCPATH= +export HGPLAIN= + hg clone "http://hg.fast-downward.org" "${ORDERED_REPOSITORY}" set +e # hg incoming has an non-zero exit code if nothing is incoming CHANGESETS="$(hg -R "${SRC_REPOSITORY}" incoming --template "{node} " --quiet "${ORDERED_REPOSITORY}")" set -e if [[ ! -z "${CHANGESETS}" ]]; then - echo stripping - HGRCPATH= HGPLAIN= \ hg -R "${ORDERED_REPOSITORY}" --config extensions.strip= strip ${CHANGESETS} --nobackup fi -HGRCPATH= HGPLAIN= \ hg -R "${ORDERED_REPOSITORY}" pull "${SRC_REPOSITORY}"