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

revert: use an exact matcher in interactive diff selection (issue5789)...

revert: use an exact matcher in interactive diff selection (issue5789) When going through _performrevert() in the interactive case, we build a matcher with files to revert and pass it patch.diff() for later selection of diff hunks to revert. The files set used to build the matcher comes from dirstate and accounts for patterns explicitly passed to revert ('hg revert -i <file>') and, in case of nonexistent pattern, this set is empty (which is expected). Unfortunately, the matcher built from scmutil.match(ctx, []) is wrong as it leads patch.diff() to rebuild a 'changes' tuple with dirstate information, ignoring user-specified pattern. This leads to the situation described in issue5789, where one gets prompted about reverting files unrelated to specified patterns because they made a typo or so. We fix this by building an exact matcher with the correct set of file paths (built earlier). Thanks to Yuya Nishihara for suggesting the correct fix.

Siddharth Agarwal - - Load All Authors

File last commit:

r34398:765eb17a default


                r36212:39b3aab6

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