##// END OF EJS Templates
localrepo: omit ".hgsubstate" also from "added" files...
localrepo: omit ".hgsubstate" also from "added" files Before this patch, "localrepository.commit()" omits ".hgsubstate" from "modified" (changes[0]) and "removed" (changes[2]) file list before checking subrepositories, but leaves one in "added" (changes[1]) as it is. Then, "localrepository.commit()" adds ".hgsubstate" into "modified" or "removed" list forcibly, according to subrepository statuses. If "added" contains ".hgsubstate", the committed context will contain two ".hgsubstate" in its "files": one from "added" (not omitted one), and another from "modified" or "removed" (newly added one). How many times ".hgsubstate" appears in "files" changes node hash, even though revision content is same, because node hash calculation uses the specified "files" directly (without duplication check or so). This means that node hash of committed revision changes according to existence of ".hgsubstate" in "added" at "localrepository.commit()". ".hgsubstate" is treated as "added", not only in accidental cases, but also in the case of "qpush" for the patch adding ".hgsubstate". This patch omits ".hgsubstate" also from "added" files before checking subrepositories. This patch also omits ".hgsubstate" exclusion in "qnew"/"qrefresh" introduced by changeset d666da075b91, because this patch makes them meaningless. "hg parents --template '{files}\n'" newly added to "test-mq-subrepo.t" enhances checking unexpected multiple appearances of ".hgsubstate" in "files" of created/refreshed MQ revisions.

File last commit:

r20747:8c89433c default
r20827:ca5dd216 default
Show More
revsetbenchmarks.sh
89 lines | 1.8 KiB | application/x-sh | BashLexer
#!/bin/bash
# Measure the performance of a list of revsets against multiple revisions
# defined by parameter. Checkout one by one and run perfrevset with every
# revset in the list to benchmark its performance.
#
# - First argument is a revset of mercurial own repo to runs against.
# - Second argument is the file from which the revset array will be taken
# If second argument is omitted read it from standard input
#
# You should run this from the root of your mercurial repository.
#
# This script also does one run of the current version of mercurial installed
# to compare performance.
HG="hg update"
PERF="./hg perfrevset"
BASE_PERF="hg perfrevset"
TARGETS=$1
shift
# read from a file or from standard output
if [ $# -ne 0 ]; then
readarray REVSETS < $1
else
readarray REVSETS
fi
hg update --quiet
echo "Starting time benchmarking"
echo
echo "Revsets to benchmark"
echo "----------------------------"
for (( j = 0; j < ${#REVSETS[@]}; j++ ));
do
echo "${j}) ${REVSETS[$j]}"
done
echo "----------------------------"
echo
# Benchmark baseline
echo "Benchmarking baseline"
for (( j = 0; j < ${#REVSETS[@]}; j++ ));
do
echo -n "${j}) "
$BASE_PERF "${REVSETS[$j]}"
done
echo
echo
# Benchmark revisions
for i in $(hg log --template='{rev}\n' --rev $TARGETS);
do
echo "----------------------------"
echo -n "Revision: "
hg log -r $i --template "{desc|firstline}"
echo "----------------------------"
$HG $i
for (( j = 0; j < ${#REVSETS[@]}; j++ ));
do
echo -n "${j}) "
$PERF "${REVSETS[$j]}"
done
echo "----------------------------"
done
$HG
# Benchmark current code
echo "Benchmarking current code"
for (( j = 0; j < ${#REVSETS[@]}; j++ ));
do
echo -n "${j}) "
$PERF "${REVSETS[$j]}"
done
echo
echo "Time benchmarking finished"