Mercurial > evolve
view tests/test-extension-isolation.t @ 4728:ef8907df73fc stable
touch: fix the inconsistent behavior of divergence catching logic (issue6107)
When touching a node, the way we check if it can lead to divergence
is we look at the successors sets of the rev being touched. And if
there is successor revs exists (excluding the case when that successor
set is (A,) for rev A) that means there will be divergence and we warn
the user.
This works fine but there is still a case (which is not covered by looking
at successor sets) which can lead to divergence.
That case is: when there is already a revision exists which is divergent
to the revision being touched. And performing the touch would revive
that "dead" divergence. (Dead because one of the revision is obsolete which
is the one we are touching)
And to see if there is any rev which is divergent to a particular rev
we already have a function which we can use here
i.e. `evolvecmd.divergentsets(repo, ctx_being_touched)`
Changes in test file demonstrate the fixed behaviour.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Wed, 17 Jul 2019 17:58:44 +0200 |
parents | 77f3699e711e |
children | 19b8ffd23795 |
line wrap: on
line source
============================ Testing extensions isolation ============================ In this test case, we check that a repository using the extensions can co-exist with a repository not using the extension. $ . $TESTDIR/testlib/common.sh Setup ===== Create repo $ hg init repo-evo $ cat > repo-evo/.hg/hgrc << EOF > [extensions] > evolve= > EOF $ hg init repo-topic $ cat > repo-topic/.hg/hgrc << EOF > [extensions] > topic= > EOF $ hg init repo-both $ cat > repo-both/.hg/hgrc << EOF > [extensions] > evolve= > topic= > EOF $ hg init repo-no-ext check setup $ hg -R repo-evo help -e evolve | head -n 1 warning: --repository ignored evolve extension - extends Mercurial feature related to Changeset Evolution $ hg -R repo-both help -e evolve | head -n 1 warning: --repository ignored evolve extension - extends Mercurial feature related to Changeset Evolution $ hg -R repo-no-ext help -e evolve warning: --repository ignored abort: no such help topic: evolve (try 'hg help --keyword evolve') [255] $ hg -R repo-no-ext help -e topic warning: --repository ignored abort: no such help topic: topic (try 'hg help --keyword topic') [255] start hgweb dir for all repo $ cat > hgweb.conf << EOF > [paths] > / = * > EOF $ hg serve -p $HGPORT -d --pid-file=hg.pid --web-conf hgweb.conf -A access.log -E error.log $ cat hg.pid >> $DAEMON_PIDS Test isolation -------------- As of 4.9 (and previous version). It seems like extensions are displayed as enabled even for repository where they are not supposed to be. See the output tagged `no-false`. (however, topic and evolve are not supposed to affect other repository as shown in the rest of this test). $ get-with-headers.py $LOCALIP:$HGPORT 'repo-no-ext/help/extensions' | grep 'enabled extensions' -A 7 [1] $ get-with-headers.py $LOCALIP:$HGPORT 'repo-evo/help/extensions' | grep 'enabled extensions' -A 7 enabled extensions: </p> <dl> <dt>evolve <dd>extends Mercurial feature related to Changeset Evolution </dl> <p> disabled extensions: $ get-with-headers.py $LOCALIP:$HGPORT 'repo-topic/help/extensions' | grep 'enabled extensions' -A 7 enabled extensions: </p> <dl> <dt>evolve (no-false !) <dd>extends Mercurial feature related to Changeset Evolution (no-false !) <dt>topic <dd>support for topic branches </dl> $ get-with-headers.py $LOCALIP:$HGPORT 'repo-both/help/extensions' | grep 'enabled extensions' -A 9 enabled extensions: </p> <dl> <dt>evolve <dd>extends Mercurial feature related to Changeset Evolution <dt>topic <dd>support for topic branches </dl> <p> disabled extensions: $ get-with-headers.py $LOCALIP:$HGPORT 'repo-no-ext/help/extensions' | grep 'enabled extensions' -A 9 enabled extensions: (no-false !) </p> (no-false !) <dl> (no-false !) <dt>evolve (no-false !) <dd>extends Mercurial feature related to Changeset Evolution (no-false !) <dt>topic (no-false !) <dd>support for topic branches (no-false !) </dl> (no-false !) <p> (no-false !) disabled extensions: (no-false !) make sure repos don't affect each other (and check both ways) Check evolve isolation ----------------------- $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext' [1] $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-evo | egrep 'topics|evoext' _evoext_getbundle_obscommon _evoext_obshashrange_v1 $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext' [1] Check topic isolation --------------------- $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext' [1] $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-topic | egrep 'topics|evoext' topics $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext' [1] Check coupled isolation ----------------------- $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext' [1] $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-both | egrep 'topics|evoext' _evoext_getbundle_obscommon _evoext_obshashrange_v1 topics $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-evo | egrep 'topics|evoext' _evoext_getbundle_obscommon _evoext_obshashrange_v1 $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-topic | egrep 'topics|evoext' topics $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-evo | egrep 'topics|evoext' _evoext_getbundle_obscommon _evoext_obshashrange_v1 $ hg debugcapabilities http://$LOCALIP:$HGPORT/repo-no-ext | egrep 'topics|evoext' [1] Final cleanup ------------- $ cat error.log $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS