# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1587057669 -19800
# Node ID 26ce8e7515036d3431a03aaeb7bc72dd96cb1112
# Parent  539490756a72d8b9c8481af3129806072e9a7bb3# Parent  59ad165f6cdb55a8fb9131e5c75f8486be8bb413
merge default into stable for 5.4 release

diff -r 59ad165f6cdb -r 26ce8e751503 mercurial/discovery.py
--- a/mercurial/discovery.py	Thu Apr 16 22:30:11 2020 +0900
+++ b/mercurial/discovery.py	Thu Apr 16 22:51:09 2020 +0530
@@ -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))
 
 
diff -r 59ad165f6cdb -r 26ce8e751503 rust/hgcli/Cargo.lock
diff -r 59ad165f6cdb -r 26ce8e751503 rust/hgcli/Cargo.toml
diff -r 59ad165f6cdb -r 26ce8e751503 rust/hgcli/build.rs
diff -r 59ad165f6cdb -r 26ce8e751503 rust/hgcli/src/main.rs
diff -r 59ad165f6cdb -r 26ce8e751503 setup.py
--- a/setup.py	Thu Apr 16 22:30:11 2020 +0900
+++ b/setup.py	Thu Apr 16 22:51:09 2020 +0530
@@ -1313,6 +1313,9 @@
 if sys.platform == 'darwin':
     osutil_ldflags += ['-framework', 'ApplicationServices']
 
+if sys.platform == 'sunos5':
+    osutil_ldflags += ['-lsocket']
+
 xdiff_srcs = [
     'mercurial/thirdparty/xdiff/xdiffi.c',
     'mercurial/thirdparty/xdiff/xprepare.c',
diff -r 59ad165f6cdb -r 26ce8e751503 tests/test-infinitepush-ci.t
--- a/tests/test-infinitepush-ci.t	Thu Apr 16 22:30:11 2020 +0900
+++ b/tests/test-infinitepush-ci.t	Thu Apr 16 22:51:09 2020 +0530
@@ -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