Mercurial > hg
view mercurial/thirdparty/attr/converters.py @ 42151:7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
We were using `true` as merge tool. I think it makes the test easier
to understand if we make the conflicts explcit. It also papered over a
conflict that shouldn't have been a conflict (just a bug in copy
tracing). I've marked that "BROKEN".
Differential Revision: https://phab.mercurial-scm.org/D6252
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sun, 14 Apr 2019 13:46:40 -0700 |
parents | 765eb17a7eb8 |
children | e1c586b9a43c |
line wrap: on
line source
""" Commonly useful converters. """ from __future__ import absolute_import, division, print_function def optional(converter): """ A converter that allows an attribute to be optional. An optional attribute is one which can be set to ``None``. :param callable converter: the converter that is used for non-``None`` values. .. versionadded:: 17.1.0 """ def optional_converter(val): if val is None: return None return converter(val) return optional_converter