This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1191

obsfate: makes successorsetverb takes the markers as argument
ClosedPublic

Authored by lothiraldan on Oct 19 2017, 7:41 AM.

Details

Reviewers
krbullock
yuja
Group Reviewers
hg-reviewers
Commits
rHGb81ad5b78a81: obsfate: makes successorsetverb takes the markers as argument
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

lothiraldan created this revision.Oct 19 2017, 7:41 AM
krbullock requested changes to this revision.Oct 19 2017, 3:23 PM
krbullock added a subscriber: krbullock.
krbullock added inline comments.
mercurial/templater.py
1011

Needs an update to the @templatefunc(...) decoration above too.

This revision now requires changes to proceed.Oct 19 2017, 3:23 PM
lothiraldan marked an inline comment as done.Oct 19 2017, 5:00 PM
lothiraldan updated this revision to Diff 3042.
lothiraldan added inline comments.Oct 19 2017, 5:00 PM
mercurial/templater.py
1011

Done

krbullock added a comment.Oct 19 2017, 5:23 PM

Deferring this until after 4.4, because the added markers argument isn't used yet.

yuja accepted this revision.Nov 9 2017, 8:35 AM
Closed by commit rHGb81ad5b78a81: obsfate: makes successorsetverb takes the markers as argument (authored by lothiraldan). · Explain WhyNov 9 2017, 9:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3374

mercurial/obsutil.py

fullsuccessorsets.append(_succs()) fullsuccessorsets.append(_succs())
values = [] values = []
for sset in fullsuccessorsets: for sset in fullsuccessorsets:
values.append({'successors': sset, 'markers': sset.markers}) values.append({'successors': sset, 'markers': sset.markers})
return values return values
def successorsetverb(successorset): def obsfateverb(successorset, markers):
""" Return the verb summarizing the successorset """ Return the verb summarizing the successorset and potentially using
information from the markers
""" """
if not successorset: if not successorset:
verb = 'pruned' verb = 'pruned'
elif len(successorset) == 1: elif len(successorset) == 1:
verb = 'rewritten' verb = 'rewritten'
else: else:
verb = 'split' verb = 'split'
return verb return verb
""" """
quiet = ui.quiet quiet = ui.quiet
verbose = ui.verbose verbose = ui.verbose
normal = not verbose and not quiet normal = not verbose and not quiet
line = [] line = []
# Verb # Verb
line.append(successorsetverb(successors)) line.append(obsfateverb(successors, markers))
# Operations # Operations
operations = markersoperations(markers) operations = markersoperations(markers)
if operations: if operations:
line.append(" using %s" % ", ".join(operations)) line.append(" using %s" % ", ".join(operations))
# Successors # Successors
if successors: if successors:

mercurial/templater.py

data = obsutil.markersusers(markers) data = obsutil.markersusers(markers)
return templatekw.hybridlist(data, name='user') return templatekw.hybridlist(data, name='user')
except (TypeError, KeyError, ValueError): except (TypeError, KeyError, ValueError):
# i18n: "obsfateusers" is a keyword # i18n: "obsfateusers" is a keyword
msg = _("obsfateusers first argument should be an iterable of " msg = _("obsfateusers first argument should be an iterable of "
"obsmakers") "obsmakers")
raise error.ParseError(msg) raise error.ParseError(msg)
@templatefunc('obsfateverb(successors)') @templatefunc('obsfateverb(successors, markers)')
def obsfateverb(context, mapping, args): def obsfateverb(context, mapping, args):
"""Compute obsfate related information based on successors (EXPERIMENTAL)""" """Compute obsfate related information based on successors (EXPERIMENTAL)"""
if len(args) != 1: if len(args) != 2:
krbullockUnsubmitted
Done

Needs an update to the @templatefunc(...) decoration above too.

krbullock: Needs an update to the `@templatefunc(...)` decoration above too.
lothiraldanAuthorUnsubmitted
Not Done

Done

lothiraldan: Done
# i18n: "obsfateverb" is a keyword # 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]) successors = evalfuncarg(context, mapping, args[0])
markers = evalfuncarg(context, mapping, args[1])
try: try:
return obsutil.successorsetverb(successors) return obsutil.obsfateverb(successors, markers)
except TypeError: except TypeError:
# i18n: "obsfateverb" is a keyword # i18n: "obsfateverb" is a keyword
errmsg = _("obsfateverb first argument should be countable") errmsg = _("obsfateverb first argument should be countable")
raise error.ParseError(errmsg) raise error.ParseError(errmsg)
@templatefunc('relpath(path)') @templatefunc('relpath(path)')
def relpath(context, mapping, args): def relpath(context, mapping, args):
"""Convert a repository-absolute path into a filesystem path relative to """Convert a repository-absolute path into a filesystem path relative to

tests/test-obsmarker-template.t

This test file test the various templates related to obsmarkers. This test file test the various templates related to obsmarkers.
Global setup Global setup
============ ============
$ . $TESTDIR/testlib/obsmarker-common.sh $ . $TESTDIR/testlib/obsmarker-common.sh
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [ui] > [ui]
> interactive = true > interactive = true
> [phases] > [phases]
> publish=False > publish=False
> [experimental] > [experimental]
> evolution=true > evolution=true
> [templates] > [templates]
> obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
> obsfateverb = "{obsfateverb(successors)}" > obsfateverb = "{obsfateverb(successors, markers)}"
> obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}" > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}"
> obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(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})")}")}" > 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})")}")}"
> obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
> [alias] > [alias]
> tlog = log -G -T '{node|short}\ > tlog = log -G -T '{node|short}\
> {if(predecessors, "\n Predecessors: {predecessors}")}\ > {if(predecessors, "\n Predecessors: {predecessors}")}\
> {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\