Mercurial > evolve
annotate tests/test-share.t @ 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 | 6c0992ce05f7 |
children |
rev | line source |
---|---|
4487
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
1 Test that share-clones use the cache in the original repository. |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
2 |
4488
6c0992ce05f7
compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4
Joerg Sonnenberger <joerg@bec.de>
parents:
4487
diff
changeset
|
3 $ . $TESTDIR/testlib/common.sh |
6c0992ce05f7
compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4
Joerg Sonnenberger <joerg@bec.de>
parents:
4487
diff
changeset
|
4 |
4487
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
5 $ hg init share-base |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
6 $ cd share-base/ |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
7 $ cat >> .hg/hgrc <<EOF |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
8 > [extensions] |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
9 > evolve= |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
10 > share= |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
11 > EOF |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
12 $ hg debugbuilddag .+3:branchpoint+4*branchpoint+2 |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
13 $ cd .. |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
14 $ hg --config extensions.share= share -U share-base share-client |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
15 $ cd share-client |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
16 $ hg debugupdatecache |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
17 $ test -d .hg/cache |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
18 [1] |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
19 $ test -d ../share-base/.hg/cache |
d972041022cb
evolve: when using evolve, cache files belong into the master repo
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
20 |