Mercurial > evolve
annotate tests/testlib/pythonpath.sh @ 4704:5f90eb8fd63c
evolve: fix confusion in branch heads checking logic when topic in play
To provide some context, when topics are in play the branchmap cache
we store contains the branch info of a rev as "branch:topic" format IIUC.
Assuming that is right, now in present code we don't actually cover
this part that "when looking for branch heads where we also have active
topic we should look for branch='branch_name:topic' instead".
And we get wrong branch heads as a result.
This patch make sure that we pass right candidate to find branch heads
using branchmap.branchheads() by overriding the localrepo.branchheads()
Changes in test file reflect the fixed behavior.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Tue, 25 Jun 2019 21:54:22 +0530 |
parents | 33fc61e5e119 |
children | 277b45cf0dda |
rev | line source |
---|---|
2046
994d81caec68
test: update test to check for various way to import the serveronly things
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 # utility to setup pythonpath to point into the tested repository |
994d81caec68
test: update test to check for various way to import the serveronly things
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
2 |
4332
9980df8eda98
tests: fix PYTHONPATH manipulation on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2046
diff
changeset
|
3 export SRCDIR="`dirname $TESTDIR`" |
2046
994d81caec68
test: update test to check for various way to import the serveronly things
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
4 if [ -n "$PYTHONPATH" ]; then |
994d81caec68
test: update test to check for various way to import the serveronly things
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
5 export HGTEST_ORIG_PYTHONPATH=$PYTHONPATH |
4336
33fc61e5e119
tests: remove unused variable and needless subshell in testlib/pythonpath.sh
Anton Shestakov <av6@dwimlabs.net>
parents:
4332
diff
changeset
|
6 if uname -o | grep -q Msys; then |
4332
9980df8eda98
tests: fix PYTHONPATH manipulation on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2046
diff
changeset
|
7 export PYTHONPATH="$SRCDIR;$PYTHONPATH" |
9980df8eda98
tests: fix PYTHONPATH manipulation on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2046
diff
changeset
|
8 else |
9980df8eda98
tests: fix PYTHONPATH manipulation on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2046
diff
changeset
|
9 export PYTHONPATH=$SRCDIR:$PYTHONPATH |
9980df8eda98
tests: fix PYTHONPATH manipulation on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2046
diff
changeset
|
10 fi |
2046
994d81caec68
test: update test to check for various way to import the serveronly things
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
11 else |
994d81caec68
test: update test to check for various way to import the serveronly things
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
12 export PYTHONPATH=$SRCDIR |
994d81caec68
test: update test to check for various way to import the serveronly things
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
13 fi |