| hg-reviewers |
Since we are inferring takesubset, it seems more consistent and
user-friendly to infer takeorder too.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/registrar.py (10 lines) | |||
| M | mercurial/revset.py (2 lines) |
| pass | pass | ||||
| The first string argument is used also in online help. | The first string argument is used also in online help. | ||||
| Optional argument 'safe' indicates whether a predicate is safe for | Optional argument 'safe' indicates whether a predicate is safe for | ||||
| DoS attack (False by default). | DoS attack (False by default). | ||||
| Optional argument 'takeorder' indicates whether a predicate function | Optional argument 'takeorder' indicates whether a predicate function | ||||
| takes ordering policy as the last argument. | takes ordering policy as the last argument. By default, takeorder is None | ||||
| and will be inferrepo from function signature. | |||||
| Optional argument 'takesubset' indicates whether a predicate function | Optional argument 'takesubset' indicates whether a predicate function | ||||
| takes subset as its second argument. By default, takesubset is None and | takes subset as its second argument. By default, takesubset is None and | ||||
| will be inferred from function signature. | will be inferred from function signature. | ||||
| New revset functions are recommended to either take none of subset and | New revset functions are recommended to either take none of subset and | ||||
| order, or take both (and use ``revset.intersect``) so it can handle | order, or take both (and use ``revset.intersect``) so it can handle | ||||
| ordering correctly. | ordering correctly. | ||||
| 'revsetpredicate' instance in example above can be used to | 'revsetpredicate' instance in example above can be used to | ||||
| decorate multiple functions. | decorate multiple functions. | ||||
| Decorated functions are registered automatically at loading | Decorated functions are registered automatically at loading | ||||
| extension, if an instance named as 'revsetpredicate' is used for | extension, if an instance named as 'revsetpredicate' is used for | ||||
| decorating in extension. | decorating in extension. | ||||
| Otherwise, explicit 'revset.loadpredicate()' is needed. | Otherwise, explicit 'revset.loadpredicate()' is needed. | ||||
| """ | """ | ||||
| _getname = _funcregistrarbase._parsefuncdecl | _getname = _funcregistrarbase._parsefuncdecl | ||||
| _docformat = "``%s``\n %s" | _docformat = "``%s``\n %s" | ||||
| def _extrasetup(self, name, func, safe=False, takeorder=False, | def _extrasetup(self, name, func, safe=False, takeorder=None, | ||||
| takesubset=None): | takesubset=None): | ||||
| args = inspect.getargspec(func).args | |||||
| if takeorder is None: | |||||
| takeorder = (len(args) >= 4) | |||||
| if takeorder: | if takeorder: | ||||
| if takesubset is False: | if takesubset is False: | ||||
| raise error.ProgrammingError( | raise error.ProgrammingError( | ||||
| 'takesubset cannot be False when takeorder is True') | 'takesubset cannot be False when takeorder is True') | ||||
| takesubset = True | takesubset = True | ||||
| if takesubset is None: | if takesubset is None: | ||||
| # detect from signature | # detect from signature | ||||
| args = inspect.getargspec(func).args | |||||
| takesubset = (len(args) >= 3) | takesubset = (len(args) >= 3) | ||||
| func._safe = safe | func._safe = safe | ||||
| func._takeorder = takeorder | func._takeorder = takeorder | ||||
| func._takesubset = takesubset | func._takesubset = takesubset | ||||
| class filesetpredicate(_funcregistrarbase): | class filesetpredicate(_funcregistrarbase): | ||||
| """Decorator to register fileset predicate | """Decorator to register fileset predicate | ||||
| def intersect(subset, newset, order): | def intersect(subset, newset, order): | ||||
| """intersect two revsets with order preserved as requested | """intersect two revsets with order preserved as requested | ||||
| If order is "followorder", preserve subset's order. If order is | If order is "followorder", preserve subset's order. If order is | ||||
| "defineorder", preserve newset's order. | "defineorder", preserve newset's order. | ||||
| A typical use of this function is:: | A typical use of this function is:: | ||||
| @revsetpredicate('myrevset', takeorder=True) | @revsetpredicate('myrevset') | ||||
| def myrevset(repo, subset, x, order): | def myrevset(repo, subset, x, order): | ||||
| newset = ... # a smartset that implements "myrevset" | newset = ... # a smartset that implements "myrevset" | ||||
| return revset.intersect(subset, newset, order) | return revset.intersect(subset, newset, order) | ||||
| """ | """ | ||||
| # some old code does not use smartset, normalize to smartset | # some old code does not use smartset, normalize to smartset | ||||
| if not util.safehasattr(newset, 'isascending'): | if not util.safehasattr(newset, 'isascending'): | ||||
| newset = subset & newset | newset = subset & newset | ||||
| if order == defineorder: | if order == defineorder: | ||||