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

merge: disallow merge abort in case of an unfinished operation (issue6160)...

merge: disallow merge abort in case of an unfinished operation (issue6160) This patch disallows `hg merge --abort` in case an operation of higher precedence i.e unshelve, rebase, histedit are in unfinished states. This is done so as to avoid partial abort of these operations in case merge abort is called at an interrupted step. The patch adds a `cmdutil.getunfinishedstate` function which checks for operations under progress and returns a `statecheck` object for it. Differential Revision: https://phab.mercurial-scm.org/D6607

Siddharth Agarwal - - Load All Authors

File last commit:

r34398:765eb17a default


                r42780:b8d54f46

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