Mercurial > hg
view tests/test-identify.t @ 44667:b561f3a68e41 stable
discovery: avoid wrongly saying there are nothing to pull
We can get in a situation where a revision passed through `hg pull --rev REV`
are available on the server, but not a descendant of the advertised server
heads.
For example the server could lying be during heads advertisement, to hide some
pull request. Or obsolete/hidden content could be explicitly pulled.
So in this case the lookup associated to `REV` returned successfully, but the
normal discovery will find all advertised heads already known locally. This flip
a special boolean `anyinc` that will prevent any fetch attempt, preventing `REV`
to be pulled over.
We add three line of code to detect this case and make sure a pull actually
happens.
My main target is to make some third party extensions happy (I expect the
associated test to move upstream with the extension). However this fix already
make some of the `infinitepush` test happier.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 06 Apr 2020 00:24:57 +0200 |
parents | 6ecfd12f09cd |
children | 8d72e29ad1e0 |
line wrap: on
line source
#require serve #if no-outer-repo no repo $ hg id abort: there is no Mercurial repository here (.hg not found) [255] #endif create repo $ hg init test $ cd test $ echo a > a $ hg ci -Ama adding a basic id usage $ hg id cb9a9f314b8b tip $ hg id --debug cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b tip $ hg id -q cb9a9f314b8b $ hg id -v cb9a9f314b8b tip with options $ hg id -r. cb9a9f314b8b tip $ hg id -n 0 $ hg id -t tip $ hg id -b default $ hg id -i cb9a9f314b8b $ hg id -n -t -b -i cb9a9f314b8b 0 default tip $ hg id -Tjson [ { "bookmarks": [], "branch": "default", "dirty": "", "id": "cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b", "node": "ffffffffffffffffffffffffffffffffffffffff", "parents": ["cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b"], "tags": ["tip"] } ] test template keywords and functions which require changectx: $ hg id -T '{rev} {node|shortest}\n' 2147483647 ffff $ hg id -T '{parents % "{rev} {node|shortest} {desc}\n"}' 0 cb9a a $ hg id -T '{parents}\n' cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b test nested template: '{tags}'/'{node}' constants shouldn't override the default keywords, but '{id}' persists because there's no default keyword for '{id}' (issue5612) $ hg id -T '{tags}\n' tip $ hg id -T '{revset("null:.") % "{rev}:{node|short} {tags} {id|short}\n"}' -1:000000000000 cb9a9f314b8b 0:cb9a9f314b8b tip cb9a9f314b8b with modifications $ echo b > a $ hg id -n -t -b -i cb9a9f314b8b+ 0+ default tip $ hg id -Tjson [ { "bookmarks": [], "branch": "default", "dirty": "+", "id": "cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b+", "node": "ffffffffffffffffffffffffffffffffffffffff", "parents": ["cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b"], "tags": ["tip"] } ] other local repo $ cd .. $ hg -R test id cb9a9f314b8b+ tip #if no-outer-repo $ hg id test cb9a9f314b8b+ tip #endif with remote http repo $ cd test $ hg serve -p $HGPORT1 -d --pid-file=hg.pid $ cat hg.pid >> $DAEMON_PIDS $ hg id http://localhost:$HGPORT1/ cb9a9f314b8b remote with rev number? $ hg id -n http://localhost:$HGPORT1/ abort: can't query remote revision number, branch, or tags [255] remote with tags? $ hg id -t http://localhost:$HGPORT1/ abort: can't query remote revision number, branch, or tags [255] remote with branch? $ hg id -b http://localhost:$HGPORT1/ abort: can't query remote revision number, branch, or tags [255] test bookmark support $ hg bookmark Y $ hg bookmark Z $ hg bookmarks Y 0:cb9a9f314b8b * Z 0:cb9a9f314b8b $ hg id cb9a9f314b8b+ tip Y/Z $ hg id --bookmarks Y Z test remote identify with bookmarks $ hg id http://localhost:$HGPORT1/ cb9a9f314b8b Y/Z $ hg id --bookmarks http://localhost:$HGPORT1/ Y Z $ hg id -r . http://localhost:$HGPORT1/ cb9a9f314b8b Y/Z $ hg id --bookmarks -r . http://localhost:$HGPORT1/ Y Z test invalid lookup $ hg id -r noNoNO http://localhost:$HGPORT1/ abort: unknown revision 'noNoNO'! [255] Make sure we do not obscure unknown requires file entries (issue2649) $ echo fake >> .hg/requires $ hg id abort: repository requires features unknown to this Mercurial: fake! (see https://mercurial-scm.org/wiki/MissingRequirement for more information) [255] $ cd .. #if no-outer-repo $ hg id test abort: repository requires features unknown to this Mercurial: fake! (see https://mercurial-scm.org/wiki/MissingRequirement for more information) [255] #endif