Mercurial > hg

changeset 32675:fc9296c15112

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkheads: simplify the code around obsolescence post-processing The 'discardedheads' return become unused and the relationship between newheads and newhs can be clarified. Our next goal here is to be able to extract the _postprocessobsolete call outside of the loop. We keep returning the 'discardedheads' because we'll start using it again soon in this series.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 29 May 2017 05:23:30 +0200
parents 7a7c4f3afb98
children 4c3d9ee87382
files mercurial/discovery.py
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/discovery.py	Mon May 29 05:21:38 2017 +0200
+++ b/mercurial/discovery.py	Mon May 29 05:23:30 2017 +0200
@@ -347,13 +347,10 @@
             oldhs = set(remoteheads)
         oldhs.update(unsyncedheads)
         dhs = None # delta heads, the new heads on branch
-        if not repo.obsstore:
-            discardedheads = set()
-            newhs = set(newheads)
-        else:
-            newhs, discardedheads = _postprocessobsolete(pushop,
-                                                         allfuturecommon,
-                                                         newheads)
+        if repo.obsstore:
+            result = _postprocessobsolete(pushop, allfuturecommon, newheads)
+            newheads = sorted(result[0])
+        newhs = set(newheads)
         newhs.update(unsyncedheads)
         if unsyncedheads:
             if None in unsyncedheads: