Mercurial > public > mercurial-scm > hg-stable
diff mercurial/obsutil.py @ 34011:3d0f8918351b
template: compute verb in obsfateverb
Add a template function obsfateverb which use the markers information to
compute a better obsfate verb.
The current logic behind the obsfate verb is simple for the moment:
- If the successorsets is empty, the changeset has been pruned, for example:
Obsfate: pruned
- If the successorsets length is 1, the changeset has been rewritten without
divergence, for example:
Obsfate: rewritten as 2:337fec4d2edc, 3:f257fde29c7a
- If the successorsets length is more than 1, the changeset has diverged, for
example:
Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a
As the divergence might occurs on a subset of successors, we might see some
successors twice:
Obsfate: split as 9:0b997eb7ceee, 5:dd800401bd8c, 10:eceed8f98ffc; split
as 8:b18bc8331526, 5:dd800401bd8c, 10:eceed8f98ffc
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 03 Jul 2017 15:33:27 +0200 |
parents | 54c21114e41d |
children | 38f08eaba6b0 |
line wrap: on
line diff
--- a/mercurial/obsutil.py Tue Aug 22 17:16:13 2017 -0400 +++ b/mercurial/obsutil.py Mon Jul 03 15:33:27 2017 +0200 @@ -590,3 +590,14 @@ values.append({'successors': sset, 'markers': sset.markers}) return values + +def successorsetverb(successorset): + """ Return the verb summarizing the successorset + """ + if not successorset: + verb = 'pruned' + elif len(successorset) == 1: + verb = 'rewritten' + else: + verb = 'split' + return verb