Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 50252:a6b8b1ab9116
branching: merge stable into default
The clippy god had to be appeased on some aspect.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 02 Mar 2023 19:02:52 +0100 |
parents | f35cf52acabd 2be6d5782728 |
children | 698ffff7024b 2cf264e9aa75 |
comparison
equal
deleted
inserted
replaced
50248:2fbc109fd58a | 50252:a6b8b1ab9116 |
---|---|
650 coreconfigitem( | 650 coreconfigitem( |
651 b'devel', | 651 b'devel', |
652 b'deprec-warn', | 652 b'deprec-warn', |
653 default=False, | 653 default=False, |
654 ) | 654 ) |
655 # possible values: | |
656 # - auto (the default) | |
657 # - force-append | |
658 # - force-new | |
659 coreconfigitem( | |
660 b'devel', | |
661 b'dirstate.v2.data_update_mode', | |
662 default="auto", | |
663 ) | |
655 coreconfigitem( | 664 coreconfigitem( |
656 b'devel', | 665 b'devel', |
657 b'disableloaddefaultcerts', | 666 b'disableloaddefaultcerts', |
658 default=False, | 667 default=False, |
659 ) | 668 ) |
686 ) | 695 ) |
687 coreconfigitem( | 696 coreconfigitem( |
688 b'devel', | 697 b'devel', |
689 b'serverrequirecert', | 698 b'serverrequirecert', |
690 default=False, | 699 default=False, |
700 ) | |
701 # Makes the status algorithm wait for the existence of this file | |
702 # (or until a timeout of `devel.sync.status.pre-dirstate-write-file-timeout` | |
703 # seconds) before taking the lock and writing the dirstate. | |
704 # Status signals that it's ready to wait by creating a file | |
705 # with the same name + `.waiting`. | |
706 # Useful when testing race conditions. | |
707 coreconfigitem( | |
708 b'devel', | |
709 b'sync.status.pre-dirstate-write-file', | |
710 default=None, | |
711 ) | |
712 coreconfigitem( | |
713 b'devel', | |
714 b'sync.status.pre-dirstate-write-file-timeout', | |
715 default=2, | |
716 ) | |
717 coreconfigitem( | |
718 b'devel', | |
719 b'sync.dirstate.post-docket-read-file', | |
720 default=None, | |
721 ) | |
722 coreconfigitem( | |
723 b'devel', | |
724 b'sync.dirstate.post-docket-read-file-timeout', | |
725 default=2, | |
726 ) | |
727 coreconfigitem( | |
728 b'devel', | |
729 b'sync.dirstate.pre-read-file', | |
730 default=None, | |
731 ) | |
732 coreconfigitem( | |
733 b'devel', | |
734 b'sync.dirstate.pre-read-file-timeout', | |
735 default=2, | |
691 ) | 736 ) |
692 coreconfigitem( | 737 coreconfigitem( |
693 b'devel', | 738 b'devel', |
694 b'strip-obsmarkers', | 739 b'strip-obsmarkers', |
695 default=True, | 740 default=True, |