# HG changeset patch # User Pierre-Yves David # Date 1497628697 -7200 # Node ID ee37ab3de5f7fbaec2617f3d18dab91b2e21c454 # Parent 81a94da65dcae7a6fd86d196a687a7ac7596d7f0 obsfate: split markers fetch from successor set annotation This will help to improve support for pruned changesets. diff -r 81a94da65dca -r ee37ab3de5f7 hgext3rd/evolve/obshistory.py --- a/hgext3rd/evolve/obshistory.py Fri Jun 16 17:55:55 2017 +0200 +++ b/hgext3rd/evolve/obshistory.py Fri Jun 16 17:58:17 2017 +0200 @@ -671,12 +671,11 @@ return markers -def preparesuccessorset(successorset, pathscache): +def preparesuccessorset(successorset, rawmarkers): """ For a successor set, get all related markers, compute the set of user, the min date and the max date """ hex = nodemod.hex - rawmarkers = successorsetallmarkers(successorset, pathscache) successorset = [hex(n) for n in successorset] diff -r 81a94da65dca -r ee37ab3de5f7 hgext3rd/evolve/templatekw.py --- a/hgext3rd/evolve/templatekw.py Fri Jun 16 17:55:55 2017 +0200 +++ b/hgext3rd/evolve/templatekw.py Fri Jun 16 17:58:17 2017 +0200 @@ -141,7 +141,8 @@ values = [] for sset in successorssets: - raw = obshistory.preparesuccessorset(sset, pathcache) + rawmarkers = obshistory.successorsetallmarkers(sset, pathcache) + raw = obshistory.preparesuccessorset(sset, rawmarkers) # As we can't do something like # "{join(map(nodeshort, successors), ', '}" in template, manually