# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1496028009 -7200
# Node ID bd966b9f327488d706dcaaeb8c4ed61cbc0845f7
# Parent  315d74d0f059bb26dd23f2329a51c9dd44cb6518
checkheads: clarify that we no longer touch the head unknown locally

Since c6cb21ddf74a, heads unknown locally no longer get any post processing
from obsolescence markers. We clarify this fact by only feeding the list of
locally known new heads to the function. This simplification of the input will
help moving that post-processing earlier in the function.

diff -r 315d74d0f059 -r bd966b9f3274 mercurial/discovery.py
--- a/mercurial/discovery.py	Mon May 29 05:33:59 2017 +0200
+++ b/mercurial/discovery.py	Mon May 29 05:20:09 2017 +0200
@@ -340,22 +340,21 @@
         allfuturecommon.update(allmissing)
     for branch, heads in sorted(headssum.iteritems()):
         remoteheads, newheads, unsyncedheads = heads
-        candidate_newhs = set(newheads)
         # add unsynced data
         if remoteheads is None:
             oldhs = set()
         else:
             oldhs = set(remoteheads)
         oldhs.update(unsyncedheads)
-        candidate_newhs.update(unsyncedheads)
         dhs = None # delta heads, the new heads on branch
         if not repo.obsstore:
             discardedheads = set()
-            newhs = candidate_newhs
+            newhs = set(newheads)
         else:
             newhs, discardedheads = _postprocessobsolete(pushop,
                                                          allfuturecommon,
-                                                         candidate_newhs)
+                                                         newheads)
+        newhs.update(unsyncedheads)
         unsynced = sorted(h for h in unsyncedheads if h not in discardedheads)
         if unsynced:
             if None in unsynced: