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

commit: get info from mergestate whether a file was merged or not...

commit: get info from mergestate whether a file was merged or not While commiting a merge, the commit code does not know whether a file was merged during `hg merge` or not. This leads the commit code to look for filelog ancestor to choose parents of new filelog created on merge commit. This leads to wrong results in some cases as demonstrated by previous patch. From this patch, we start storing information about merged files in mergestate in stateextras and then use that on commit to detect whether we need to set two parents or not. Differential Revision: https://phab.mercurial-scm.org/D10149

Siddharth Agarwal - - Load All Authors

File last commit:

r34398:765eb17a default


                r47567:5a0b930c

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