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.
--- a/mercurial/discovery.py Thu Apr 02 12:05:41 2020 -0400
+++ b/mercurial/discovery.py Mon Apr 06 00:24:57 2020 +0200
@@ -67,6 +67,10 @@
ancestorsof=ancestorsof,
)
common, anyinc, srvheads = res
+ if heads and not anyinc:
+ # server could be lying on the advertised heads
+ has_node = repo.changelog.hasnode
+ anyinc = any(not has_node(n) for n in heads)
return (list(common), anyinc, heads or list(srvheads))
--- a/tests/test-infinitepush-ci.t Thu Apr 02 12:05:41 2020 -0400
+++ b/tests/test-infinitepush-ci.t Mon Apr 06 00:24:57 2020 +0200
@@ -249,12 +249,12 @@
$ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef
pulling from ssh://user@dummy/repo
searching for changes
- no changes found
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
new changesets eaba929e866c:b4e4bce66051
+ (run 'hg update' to get a working copy)
$ hg glog
o 5:b4e4bce66051 added e
| public