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

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict...

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict When in-memory rebase runs into conflicts, it redoes the whole rebase operation. This patch teaches it to instead discard just the current `overlayworkingctx` and redo that node on disk. I've tested this by enabling in-memory rebase by default and checking that there are no unexpected differences after this patch. The next step is to make it so that `hg rebase --continue` can use in-memory merge. Differential Revision: https://phab.mercurial-scm.org/D9076

Siddharth Agarwal - - Load All Authors

File last commit:

r34398:765eb17a default


                r46132:feffeb18

default

Download file

             _config.py
        
                    23 lines
            
             | 514 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / thirdparty / attr / _config.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import, division, print_function

      __all__ = ["set_run_validators", "get_run_validators"]

      _run_validators = True

      def set_run_validators(run):

          """

          Set whether or not validators are run.  By default, they are run.

          """

          if not isinstance(run, bool):

              raise TypeError("'run' must be bool.")

          global _run_validators

          _run_validators = run

      def get_run_validators():

          """

          Return whether or not validators are run.

          """

          return _run_validators

	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

				from __future__ import absolute_import, division, print_function


				__all__ = ["set_run_validators", "get_run_validators"]

				_run_validators = True


				def set_run_validators(run):
				"""
				Set whether or not validators are run. By default, they are run.
				"""
				if not isinstance(run, bool):
				raise TypeError("'run' must be bool.")
				global _run_validators
				_run_validators = run


				def get_run_validators():
				"""
				Return whether or not validators are run.
				"""
				return _run_validators