upstream/mercurial-mirror Files · mercurial/thirdparty/attr/converters.py

merge-tools: when calling external merge tool, describe the resolve inputs...

merge-tools: when calling external merge tool, describe the resolve inputs It is a common complaint that a user will be running some operation (histedit, rebase, evolve, etc.), get into a merge-conflict situation, and not understand what they are seeing - it is possible that the merge tool is configured to display the hash, but it's difficult for most merge tools to display a good snippet of the description. In the worst case, configuring this template will lead to output that is immediately covered by a terminal application, maybe the user can hit ctrl-z to see it. In the common case, the output will be in a terminal window and a GUI program will start, and it should be possible to view both the terminal and the GUI program at the same time. Differential Revision: https://phab.mercurial-scm.org/D5094

Siddharth Agarwal - - Load All Authors

File last commit:

r34398:765eb17a default


                r40512:86dfae98

default

Download file

             converters.py
        
                    24 lines
            
             | 531 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / thirdparty / attr / converters.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """

      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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				"""
				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