# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1507745282 -7200
# Node ID e2c42f751b06d03298526306c190caa13d8602fa
# Parent  68e0bcb903572cb3641c1b1ac11bdcf47d4ff5ac
phase: filter out non-draft item in "draft root"

The on-disk file can contain draft root that are descendants of secret root.
The resulting phase computation is correct, but the phases root content is
not. I will send another series to introduce code that remove some of the
cases where this can happens, but we first need to damage control the existing
case.

After this changeset, we can no longer advertise secret changeset as draft
root.

diff -r 68e0bcb90357 -r e2c42f751b06 mercurial/phases.py
--- a/mercurial/phases.py	Sun Oct 15 22:48:02 2017 -0400
+++ b/mercurial/phases.py	Wed Oct 11 20:08:02 2017 +0200
@@ -502,8 +502,10 @@
     # Use ordered dictionary so behavior is deterministic.
     keys = util.sortdict()
     value = '%i' % draft
+    cl = repo.unfiltered().changelog
     for root in repo._phasecache.phaseroots[draft]:
-        keys[hex(root)] = value
+        if repo._phasecache.phase(repo, cl.rev(root)) <= draft:
+            keys[hex(root)] = value
 
     if repo.publishing():
         # Add an extra data to let remote know we are a publishing