Mercurial > hg
changeset 35010:b81ad5b78a81
obsfate: makes successorsetverb takes the markers as argument
Right now, successorsetverb only needs successors to compute the verb. But we
will want use additional information (effect-flags and operation) in the near
future to compute a better verb.
Add the markers parameter now so extensions (like Evolve) could wrap the
function and start experimenting around better obsfate verbs.
As successorsetverb now takes both successorset and markers parameters, rename
it to obsfateverb, successorsetandmarkersverb was too long.
Differential Revision: https://phab.mercurial-scm.org/D1191
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 19 Oct 2017 12:35:47 +0200 |
| parents | 407ec7f3ff02 |
| children | a2dfc723b6b5 |
| files | mercurial/obsutil.py mercurial/templater.py tests/test-obsmarker-template.t |
| diffstat | 3 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/obsutil.py Tue Nov 07 13:48:33 2017 -0800 +++ b/mercurial/obsutil.py Thu Oct 19 12:35:47 2017 +0200 @@ -751,8 +751,9 @@ return values -def successorsetverb(successorset): - """ Return the verb summarizing the successorset +def obsfateverb(successorset, markers): + """ Return the verb summarizing the successorset and potentially using + information from the markers """ if not successorset: verb = 'pruned' @@ -795,7 +796,7 @@ line = [] # Verb - line.append(successorsetverb(successors)) + line.append(obsfateverb(successors, markers)) # Operations operations = markersoperations(markers)
--- a/mercurial/templater.py Tue Nov 07 13:48:33 2017 -0800 +++ b/mercurial/templater.py Thu Oct 19 12:35:47 2017 +0200 @@ -1005,17 +1005,18 @@ "obsmakers") raise error.ParseError(msg) -@templatefunc('obsfateverb(successors)') +@templatefunc('obsfateverb(successors, markers)') def obsfateverb(context, mapping, args): """Compute obsfate related information based on successors (EXPERIMENTAL)""" - if len(args) != 1: + if len(args) != 2: # i18n: "obsfateverb" is a keyword - raise error.ParseError(_("obsfateverb expects one arguments")) + raise error.ParseError(_("obsfateverb expects two arguments")) successors = evalfuncarg(context, mapping, args[0]) + markers = evalfuncarg(context, mapping, args[1]) try: - return obsutil.successorsetverb(successors) + return obsutil.obsfateverb(successors, markers) except TypeError: # i18n: "obsfateverb" is a keyword errmsg = _("obsfateverb first argument should be countable")
--- a/tests/test-obsmarker-template.t Tue Nov 07 13:48:33 2017 -0800 +++ b/tests/test-obsmarker-template.t Thu Oct 19 12:35:47 2017 +0200 @@ -13,7 +13,7 @@ > evolution=true > [templates] > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" - > obsfateverb = "{obsfateverb(successors)}" + > obsfateverb = "{obsfateverb(successors, markers)}" > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}" > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}"