changeset 2606:02129bed002c

obsfate: improve prune support in _successorsetverb In the prune case, still have markers (at least the prune markers). If we want to be able to return these markers we need the underlying function to support it.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 16 Jun 2017 16:50:11 +0200
parents 7d9608219362
children 054d92586e43
files hgext3rd/evolve/obshistory.py
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/obshistory.py	Fri Jun 16 12:37:03 2017 +0200
+++ b/hgext3rd/evolve/obshistory.py	Fri Jun 16 16:50:11 2017 +0200
@@ -629,11 +629,11 @@
 def _successorsetverb(successorset, markers):
     """ Return the verb summarizing the successorset
     """
-    # XXX we need to handle prune markers at some point.
-    if not markers:
-        return {'verb': 'pruned'}
-
-    return {'verb': 'rewritten'}
+    if not successorset:
+        verb = 'pruned'
+    else:
+        verb = 'rewritten'
+    return {'verb': verb}
 
 FORMATSSETSFUNCTIONS = [
     _successorsetdates,