##// END OF EJS Templates
help/config: separate terms with a blank line...
Martin Geisler -
r14458:c62b3b74 default
parent child Browse files
Show More
@@ -294,21 +294,26 b' Supported arguments:'
294 1). If the prefix doesn't include a scheme, the match is performed
294 1). If the prefix doesn't include a scheme, the match is performed
295 against the URI with its scheme stripped as well, and the schemes
295 against the URI with its scheme stripped as well, and the schemes
296 argument, q.v., is then subsequently consulted.
296 argument, q.v., is then subsequently consulted.
297
297 ``username``
298 ``username``
298 Optional. Username to authenticate with. If not given, and the
299 Optional. Username to authenticate with. If not given, and the
299 remote site requires basic or digest authentication, the user will
300 remote site requires basic or digest authentication, the user will
300 be prompted for it. Environment variables are expanded in the
301 be prompted for it. Environment variables are expanded in the
301 username letting you do ``foo.username = $USER``.
302 username letting you do ``foo.username = $USER``.
303
302 ``password``
304 ``password``
303 Optional. Password to authenticate with. If not given, and the
305 Optional. Password to authenticate with. If not given, and the
304 remote site requires basic or digest authentication, the user
306 remote site requires basic or digest authentication, the user
305 will be prompted for it.
307 will be prompted for it.
308
306 ``key``
309 ``key``
307 Optional. PEM encoded client certificate key file. Environment
310 Optional. PEM encoded client certificate key file. Environment
308 variables are expanded in the filename.
311 variables are expanded in the filename.
312
309 ``cert``
313 ``cert``
310 Optional. PEM encoded client certificate chain file. Environment
314 Optional. PEM encoded client certificate chain file. Environment
311 variables are expanded in the filename.
315 variables are expanded in the filename.
316
312 ``schemes``
317 ``schemes``
313 Optional. Space separated list of URI schemes to use this
318 Optional. Space separated list of URI schemes to use this
314 authentication entry with. Only used if the prefix doesn't include
319 authentication entry with. Only used if the prefix doesn't include
@@ -395,16 +400,22 b' Boolean and defaults to False.'
395
400
396 ``git``
401 ``git``
397 Use git extended diff format.
402 Use git extended diff format.
403
398 ``nodates``
404 ``nodates``
399 Don't include dates in diff headers.
405 Don't include dates in diff headers.
406
400 ``showfunc``
407 ``showfunc``
401 Show which function each change is in.
408 Show which function each change is in.
409
402 ``ignorews``
410 ``ignorews``
403 Ignore white space when comparing lines.
411 Ignore white space when comparing lines.
412
404 ``ignorewsamount``
413 ``ignorewsamount``
405 Ignore changes in the amount of white space.
414 Ignore changes in the amount of white space.
415
406 ``ignoreblanklines``
416 ``ignoreblanklines``
407 Ignore changes whose lines are all blank.
417 Ignore changes whose lines are all blank.
418
408 ``unified``
419 ``unified``
409 Number of lines of context to show.
420 Number of lines of context to show.
410
421
@@ -416,14 +427,18 b' Settings for extensions that send email '
416 ``from``
427 ``from``
417 Optional. Email address to use in "From" header and SMTP envelope
428 Optional. Email address to use in "From" header and SMTP envelope
418 of outgoing messages.
429 of outgoing messages.
430
419 ``to``
431 ``to``
420 Optional. Comma-separated list of recipients' email addresses.
432 Optional. Comma-separated list of recipients' email addresses.
433
421 ``cc``
434 ``cc``
422 Optional. Comma-separated list of carbon copy recipients'
435 Optional. Comma-separated list of carbon copy recipients'
423 email addresses.
436 email addresses.
437
424 ``bcc``
438 ``bcc``
425 Optional. Comma-separated list of blind carbon copy recipients'
439 Optional. Comma-separated list of blind carbon copy recipients'
426 email addresses.
440 email addresses.
441
427 ``method``
442 ``method``
428 Optional. Method to use to send email messages. If value is ``smtp``
443 Optional. Method to use to send email messages. If value is ``smtp``
429 (default), use SMTP (see the SMTP_ section for configuration).
444 (default), use SMTP (see the SMTP_ section for configuration).
@@ -431,6 +446,7 b' Settings for extensions that send email '
431 (takes ``-f`` option for sender, list of recipients on command line,
446 (takes ``-f`` option for sender, list of recipients on command line,
432 message on stdin). Normally, setting this to ``sendmail`` or
447 message on stdin). Normally, setting this to ``sendmail`` or
433 ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.
448 ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.
449
434 ``charsets``
450 ``charsets``
435 Optional. Comma-separated list of character sets considered
451 Optional. Comma-separated list of character sets considered
436 convenient for recipients. Addresses, headers, and parts not
452 convenient for recipients. Addresses, headers, and parts not
@@ -570,26 +586,32 b' Supported arguments:'
570 ``priority``
586 ``priority``
571 The priority in which to evaluate this tool.
587 The priority in which to evaluate this tool.
572 Default: 0.
588 Default: 0.
589
573 ``executable``
590 ``executable``
574 Either just the name of the executable or its pathname. On Windows,
591 Either just the name of the executable or its pathname. On Windows,
575 the path can use environment variables with ${ProgramFiles} syntax.
592 the path can use environment variables with ${ProgramFiles} syntax.
576 Default: the tool name.
593 Default: the tool name.
594
577 ``args``
595 ``args``
578 The arguments to pass to the tool executable. You can refer to the
596 The arguments to pass to the tool executable. You can refer to the
579 files being merged as well as the output file through these
597 files being merged as well as the output file through these
580 variables: ``$base``, ``$local``, ``$other``, ``$output``.
598 variables: ``$base``, ``$local``, ``$other``, ``$output``.
581 Default: ``$local $base $other``
599 Default: ``$local $base $other``
600
582 ``premerge``
601 ``premerge``
583 Attempt to run internal non-interactive 3-way merge tool before
602 Attempt to run internal non-interactive 3-way merge tool before
584 launching external tool. Options are ``true``, ``false``, or ``keep``
603 launching external tool. Options are ``true``, ``false``, or ``keep``
585 to leave markers in the file if the premerge fails.
604 to leave markers in the file if the premerge fails.
586 Default: True
605 Default: True
606
587 ``binary``
607 ``binary``
588 This tool can merge binary files. Defaults to False, unless tool
608 This tool can merge binary files. Defaults to False, unless tool
589 was selected by file pattern match.
609 was selected by file pattern match.
610
590 ``symlink``
611 ``symlink``
591 This tool can merge symlinks. Defaults to False, even if tool was
612 This tool can merge symlinks. Defaults to False, even if tool was
592 selected by file pattern match.
613 selected by file pattern match.
614
593 ``check``
615 ``check``
594 A list of merge success-checking options:
616 A list of merge success-checking options:
595
617
@@ -603,28 +625,35 b' Supported arguments:'
603 ``checkchanged``
625 ``checkchanged``
604 True is equivalent to ``check = changed``.
626 True is equivalent to ``check = changed``.
605 Default: False
627 Default: False
628
606 ``checkconflicts``
629 ``checkconflicts``
607 True is equivalent to ``check = conflicts``.
630 True is equivalent to ``check = conflicts``.
608 Default: False
631 Default: False
632
609 ``fixeol``
633 ``fixeol``
610 Attempt to fix up EOL changes caused by the merge tool.
634 Attempt to fix up EOL changes caused by the merge tool.
611 Default: False
635 Default: False
636
612 ``gui``
637 ``gui``
613 This tool requires a graphical interface to run. Default: False
638 This tool requires a graphical interface to run. Default: False
639
614 ``regkey``
640 ``regkey``
615 Windows registry key which describes install location of this
641 Windows registry key which describes install location of this
616 tool. Mercurial will search for this key first under
642 tool. Mercurial will search for this key first under
617 ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
643 ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
618 Default: None
644 Default: None
645
619 ``regkeyalt``
646 ``regkeyalt``
620 An alternate Windows registry key to try if the first key is not
647 An alternate Windows registry key to try if the first key is not
621 found. The alternate key uses the same ``regname`` and ``regappend``
648 found. The alternate key uses the same ``regname`` and ``regappend``
622 semantics of the primary key. The most common use for this key
649 semantics of the primary key. The most common use for this key
623 is to search for 32bit applications on 64bit operating systems.
650 is to search for 32bit applications on 64bit operating systems.
624 Default: None
651 Default: None
652
625 ``regname``
653 ``regname``
626 Name of value to read from specified registry key. Defaults to the
654 Name of value to read from specified registry key. Defaults to the
627 unnamed (default) value.
655 unnamed (default) value.
656
628 ``regappend``
657 ``regappend``
629 String to append to the value read from the registry, typically
658 String to append to the value read from the registry, typically
630 the executable name of the tool.
659 the executable name of the tool.
@@ -658,18 +687,22 b' variables it is passed are listed with n'
658 Run after a changegroup has been added via push, pull or unbundle.
687 Run after a changegroup has been added via push, pull or unbundle.
659 ID of the first new changeset is in ``$HG_NODE``. URL from which
688 ID of the first new changeset is in ``$HG_NODE``. URL from which
660 changes came is in ``$HG_URL``.
689 changes came is in ``$HG_URL``.
690
661 ``commit``
691 ``commit``
662 Run after a changeset has been created in the local repository. ID
692 Run after a changeset has been created in the local repository. ID
663 of the newly created changeset is in ``$HG_NODE``. Parent changeset
693 of the newly created changeset is in ``$HG_NODE``. Parent changeset
664 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
694 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
695
665 ``incoming``
696 ``incoming``
666 Run after a changeset has been pulled, pushed, or unbundled into
697 Run after a changeset has been pulled, pushed, or unbundled into
667 the local repository. The ID of the newly arrived changeset is in
698 the local repository. The ID of the newly arrived changeset is in
668 ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``.
699 ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``.
700
669 ``outgoing``
701 ``outgoing``
670 Run after sending changes from local repository to another. ID of
702 Run after sending changes from local repository to another. ID of
671 first changeset sent is in ``$HG_NODE``. Source of operation is in
703 first changeset sent is in ``$HG_NODE``. Source of operation is in
672 ``$HG_SOURCE``; see "preoutgoing" hook for description.
704 ``$HG_SOURCE``; see "preoutgoing" hook for description.
705
673 ``post-<command>``
706 ``post-<command>``
674 Run after successful invocations of the associated command. The
707 Run after successful invocations of the associated command. The
675 contents of the command line are passed as ``$HG_ARGS`` and the result
708 contents of the command line are passed as ``$HG_ARGS`` and the result
@@ -678,6 +711,7 b' variables it is passed are listed with n'
678 the python data internally passed to <command>. ``$HG_OPTS`` is a
711 the python data internally passed to <command>. ``$HG_OPTS`` is a
679 dictionary of options (with unspecified options set to their defaults).
712 dictionary of options (with unspecified options set to their defaults).
680 ``$HG_PATS`` is a list of arguments. Hook failure is ignored.
713 ``$HG_PATS`` is a list of arguments. Hook failure is ignored.
714
681 ``pre-<command>``
715 ``pre-<command>``
682 Run before executing the associated command. The contents of the
716 Run before executing the associated command. The contents of the
683 command line are passed as ``$HG_ARGS``. Parsed command line arguments
717 command line are passed as ``$HG_ARGS``. Parsed command line arguments
@@ -687,19 +721,23 b' variables it is passed are listed with n'
687 defaults). ``$HG_PATS`` is a list of arguments. If the hook returns
721 defaults). ``$HG_PATS`` is a list of arguments. If the hook returns
688 failure, the command doesn't execute and Mercurial returns the failure
722 failure, the command doesn't execute and Mercurial returns the failure
689 code.
723 code.
724
690 ``prechangegroup``
725 ``prechangegroup``
691 Run before a changegroup is added via push, pull or unbundle. Exit
726 Run before a changegroup is added via push, pull or unbundle. Exit
692 status 0 allows the changegroup to proceed. Non-zero status will
727 status 0 allows the changegroup to proceed. Non-zero status will
693 cause the push, pull or unbundle to fail. URL from which changes
728 cause the push, pull or unbundle to fail. URL from which changes
694 will come is in ``$HG_URL``.
729 will come is in ``$HG_URL``.
730
695 ``precommit``
731 ``precommit``
696 Run before starting a local commit. Exit status 0 allows the
732 Run before starting a local commit. Exit status 0 allows the
697 commit to proceed. Non-zero status will cause the commit to fail.
733 commit to proceed. Non-zero status will cause the commit to fail.
698 Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
734 Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
735
699 ``prelistkeys``
736 ``prelistkeys``
700 Run before listing pushkeys (like bookmarks) in the
737 Run before listing pushkeys (like bookmarks) in the
701 repository. Non-zero status will cause failure. The key namespace is
738 repository. Non-zero status will cause failure. The key namespace is
702 in ``$HG_NAMESPACE``.
739 in ``$HG_NAMESPACE``.
740
703 ``preoutgoing``
741 ``preoutgoing``
704 Run before collecting changes to send from the local repository to
742 Run before collecting changes to send from the local repository to
705 another. Non-zero status will cause failure. This lets you prevent
743 another. Non-zero status will cause failure. This lets you prevent
@@ -709,17 +747,20 b' variables it is passed are listed with n'
709 ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote
747 ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote
710 SSH or HTTP repository. If "push", "pull" or "bundle", operation
748 SSH or HTTP repository. If "push", "pull" or "bundle", operation
711 is happening on behalf of repository on same system.
749 is happening on behalf of repository on same system.
750
712 ``prepushkey``
751 ``prepushkey``
713 Run before a pushkey (like a bookmark) is added to the
752 Run before a pushkey (like a bookmark) is added to the
714 repository. Non-zero status will cause the key to be rejected. The
753 repository. Non-zero status will cause the key to be rejected. The
715 key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,
754 key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,
716 the old value (if any) is in ``$HG_OLD``, and the new value is in
755 the old value (if any) is in ``$HG_OLD``, and the new value is in
717 ``$HG_NEW``.
756 ``$HG_NEW``.
757
718 ``pretag``
758 ``pretag``
719 Run before creating a tag. Exit status 0 allows the tag to be
759 Run before creating a tag. Exit status 0 allows the tag to be
720 created. Non-zero status will cause the tag to fail. ID of
760 created. Non-zero status will cause the tag to fail. ID of
721 changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is
761 changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is
722 local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``.
762 local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``.
763
723 ``pretxnchangegroup``
764 ``pretxnchangegroup``
724 Run after a changegroup has been added via push, pull or unbundle,
765 Run after a changegroup has been added via push, pull or unbundle,
725 but before the transaction has been committed. Changegroup is
766 but before the transaction has been committed. Changegroup is
@@ -729,6 +770,7 b' variables it is passed are listed with n'
729 status will cause the transaction to be rolled back and the push,
770 status will cause the transaction to be rolled back and the push,
730 pull or unbundle will fail. URL that was source of changes is in
771 pull or unbundle will fail. URL that was source of changes is in
731 ``$HG_URL``.
772 ``$HG_URL``.
773
732 ``pretxncommit``
774 ``pretxncommit``
733 Run after a changeset has been created but the transaction not yet
775 Run after a changeset has been created but the transaction not yet
734 committed. Changeset is visible to hook program. This lets you
776 committed. Changeset is visible to hook program. This lets you
@@ -736,24 +778,29 b' variables it is passed are listed with n'
736 commit to proceed. Non-zero status will cause the transaction to
778 commit to proceed. Non-zero status will cause the transaction to
737 be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset
779 be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset
738 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
780 IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
781
739 ``preupdate``
782 ``preupdate``
740 Run before updating the working directory. Exit status 0 allows
783 Run before updating the working directory. Exit status 0 allows
741 the update to proceed. Non-zero status will prevent the update.
784 the update to proceed. Non-zero status will prevent the update.
742 Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID
785 Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID
743 of second new parent is in ``$HG_PARENT2``.
786 of second new parent is in ``$HG_PARENT2``.
787
744 ``listkeys``
788 ``listkeys``
745 Run after listing pushkeys (like bookmarks) in the repository. The
789 Run after listing pushkeys (like bookmarks) in the repository. The
746 key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a
790 key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a
747 dictionary containing the keys and values.
791 dictionary containing the keys and values.
792
748 ``pushkey``
793 ``pushkey``
749 Run after a pushkey (like a bookmark) is added to the
794 Run after a pushkey (like a bookmark) is added to the
750 repository. The key namespace is in ``$HG_NAMESPACE``, the key is in
795 repository. The key namespace is in ``$HG_NAMESPACE``, the key is in
751 ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new
796 ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new
752 value is in ``$HG_NEW``.
797 value is in ``$HG_NEW``.
798
753 ``tag``
799 ``tag``
754 Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.
800 Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.
755 Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in
801 Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in
756 repository if ``$HG_LOCAL=0``.
802 repository if ``$HG_LOCAL=0``.
803
757 ``update``
804 ``update``
758 Run after updating the working directory. Changeset ID of first
805 Run after updating the working directory. Changeset ID of first
759 new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is
806 new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is
@@ -796,13 +843,17 b' proxy.'
796 ``host``
843 ``host``
797 Host name and (optional) port of the proxy server, for example
844 Host name and (optional) port of the proxy server, for example
798 "myproxy:8000".
845 "myproxy:8000".
846
799 ``no``
847 ``no``
800 Optional. Comma-separated list of host names that should bypass
848 Optional. Comma-separated list of host names that should bypass
801 the proxy.
849 the proxy.
850
802 ``passwd``
851 ``passwd``
803 Optional. Password to authenticate with at the proxy server.
852 Optional. Password to authenticate with at the proxy server.
853
804 ``user``
854 ``user``
805 Optional. User name to authenticate with at the proxy server.
855 Optional. User name to authenticate with at the proxy server.
856
806 ``always``
857 ``always``
807 Optional. Always use the proxy, even for localhost and any entries
858 Optional. Always use the proxy, even for localhost and any entries
808 in ``http_proxy.no``. True or False. Default: False.
859 in ``http_proxy.no``. True or False. Default: False.
@@ -814,18 +865,23 b' Configuration for extensions that need t'
814
865
815 ``host``
866 ``host``
816 Host name of mail server, e.g. "mail.example.com".
867 Host name of mail server, e.g. "mail.example.com".
868
817 ``port``
869 ``port``
818 Optional. Port to connect to on mail server. Default: 25.
870 Optional. Port to connect to on mail server. Default: 25.
871
819 ``tls``
872 ``tls``
820 Optional. Method to enable TLS when connecting to mail server: starttls,
873 Optional. Method to enable TLS when connecting to mail server: starttls,
821 smtps or none. Default: none.
874 smtps or none. Default: none.
875
822 ``username``
876 ``username``
823 Optional. User name for authenticating with the SMTP server.
877 Optional. User name for authenticating with the SMTP server.
824 Default: none.
878 Default: none.
879
825 ``password``
880 ``password``
826 Optional. Password for authenticating with the SMTP server. If not
881 Optional. Password for authenticating with the SMTP server. If not
827 specified, interactive sessions will prompt the user for a
882 specified, interactive sessions will prompt the user for a
828 password; non-interactive sessions will fail. Default: none.
883 password; non-interactive sessions will fail. Default: none.
884
829 ``local_hostname``
885 ``local_hostname``
830 Optional. It's the hostname that the sender can use to identify
886 Optional. It's the hostname that the sender can use to identify
831 itself to the MTA.
887 itself to the MTA.
@@ -861,6 +917,7 b' the following entries.'
861 Directory or URL to use when pulling if no source is specified.
917 Directory or URL to use when pulling if no source is specified.
862 Default is set to repository from which the current repository was
918 Default is set to repository from which the current repository was
863 cloned.
919 cloned.
920
864 ``default-push``
921 ``default-push``
865 Optional. Directory or URL to use when pushing if no destination
922 Optional. Directory or URL to use when pushing if no destination
866 is specified.
923 is specified.
@@ -887,6 +944,7 b' using lsprof.'
887 Format profiling data for kcachegrind use: when saving to a
944 Format profiling data for kcachegrind use: when saving to a
888 file, the generated file can directly be loaded into
945 file, the generated file can directly be loaded into
889 kcachegrind.
946 kcachegrind.
947
890 ``output``
948 ``output``
891 File path where profiling data or report should be saved. If the
949 File path where profiling data or report should be saved. If the
892 file exists, it is replaced. Default: None, data is printed on
950 file exists, it is replaced. Default: None, data is printed on
@@ -951,6 +1009,7 b' user or service running Mercurial.'
951
1009
952 ``users``
1010 ``users``
953 Comma-separated list of trusted users.
1011 Comma-separated list of trusted users.
1012
954 ``groups``
1013 ``groups``
955 Comma-separated list of trusted groups.
1014 Comma-separated list of trusted groups.
956
1015
@@ -965,24 +1024,30 b' User interface controls.'
965 (hashes for the repository base and for tip) in archives created
1024 (hashes for the repository base and for tip) in archives created
966 by the :hg:`archive` command or downloaded via hgweb.
1025 by the :hg:`archive` command or downloaded via hgweb.
967 Default is True.
1026 Default is True.
1027
968 ``askusername``
1028 ``askusername``
969 Whether to prompt for a username when committing. If True, and
1029 Whether to prompt for a username when committing. If True, and
970 neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will
1030 neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will
971 be prompted to enter a username. If no username is entered, the
1031 be prompted to enter a username. If no username is entered, the
972 default ``USER@HOST`` is used instead.
1032 default ``USER@HOST`` is used instead.
973 Default is False.
1033 Default is False.
1034
974 ``commitsubrepos``
1035 ``commitsubrepos``
975 Whether to commit modified subrepositories when committing the
1036 Whether to commit modified subrepositories when committing the
976 parent repository. If False and one subrepository has uncommitted
1037 parent repository. If False and one subrepository has uncommitted
977 changes, abort the commit.
1038 changes, abort the commit.
978 Default is True.
1039 Default is True.
1040
979 ``debug``
1041 ``debug``
980 Print debugging information. True or False. Default is False.
1042 Print debugging information. True or False. Default is False.
1043
981 ``editor``
1044 ``editor``
982 The editor to use during a commit. Default is ``$EDITOR`` or ``vi``.
1045 The editor to use during a commit. Default is ``$EDITOR`` or ``vi``.
1046
983 ``fallbackencoding``
1047 ``fallbackencoding``
984 Encoding to try if it's not possible to decode the changelog using
1048 Encoding to try if it's not possible to decode the changelog using
985 UTF-8. Default is ISO-8859-1.
1049 UTF-8. Default is ISO-8859-1.
1050
986 ``ignore``
1051 ``ignore``
987 A file to read per-user ignore patterns from. This file should be
1052 A file to read per-user ignore patterns from. This file should be
988 in the same format as a repository-wide .hgignore file. This
1053 in the same format as a repository-wide .hgignore file. This
@@ -990,14 +1055,18 b' User interface controls.'
990 ignore files, you can do so by setting something like
1055 ignore files, you can do so by setting something like
991 ``ignore.other = ~/.hgignore2``. For details of the ignore file
1056 ``ignore.other = ~/.hgignore2``. For details of the ignore file
992 format, see the |hgignore(5)|_ man page.
1057 format, see the |hgignore(5)|_ man page.
1058
993 ``interactive``
1059 ``interactive``
994 Allow to prompt the user. True or False. Default is True.
1060 Allow to prompt the user. True or False. Default is True.
1061
995 ``logtemplate``
1062 ``logtemplate``
996 Template string for commands that print changesets.
1063 Template string for commands that print changesets.
1064
997 ``merge``
1065 ``merge``
998 The conflict resolution program to use during a manual merge.
1066 The conflict resolution program to use during a manual merge.
999 For more information on merge tools see :hg:`help merge-tools`.
1067 For more information on merge tools see :hg:`help merge-tools`.
1000 For configuring merge tools see the merge-tools_ section.
1068 For configuring merge tools see the merge-tools_ section.
1069
1001 ``portablefilenames``
1070 ``portablefilenames``
1002 Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.
1071 Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.
1003 Default is ``warn``.
1072 Default is ``warn``.
@@ -1009,34 +1078,44 b' User interface controls.'
1009 If set to ``ignore`` (or ``false``), no warning is printed.
1078 If set to ``ignore`` (or ``false``), no warning is printed.
1010 If set to ``abort``, the command is aborted.
1079 If set to ``abort``, the command is aborted.
1011 On Windows, this configuration option is ignored and the command aborted.
1080 On Windows, this configuration option is ignored and the command aborted.
1081
1012 ``quiet``
1082 ``quiet``
1013 Reduce the amount of output printed. True or False. Default is False.
1083 Reduce the amount of output printed. True or False. Default is False.
1084
1014 ``remotecmd``
1085 ``remotecmd``
1015 remote command to use for clone/push/pull operations. Default is ``hg``.
1086 remote command to use for clone/push/pull operations. Default is ``hg``.
1087
1016 ``report_untrusted``
1088 ``report_untrusted``
1017 Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
1089 Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
1018 trusted user or group. True or False. Default is True.
1090 trusted user or group. True or False. Default is True.
1091
1019 ``slash``
1092 ``slash``
1020 Display paths using a slash (``/``) as the path separator. This
1093 Display paths using a slash (``/``) as the path separator. This
1021 only makes a difference on systems where the default path
1094 only makes a difference on systems where the default path
1022 separator is not the slash character (e.g. Windows uses the
1095 separator is not the slash character (e.g. Windows uses the
1023 backslash character (``\``)).
1096 backslash character (``\``)).
1024 Default is False.
1097 Default is False.
1098
1025 ``ssh``
1099 ``ssh``
1026 command to use for SSH connections. Default is ``ssh``.
1100 command to use for SSH connections. Default is ``ssh``.
1101
1027 ``strict``
1102 ``strict``
1028 Require exact command names, instead of allowing unambiguous
1103 Require exact command names, instead of allowing unambiguous
1029 abbreviations. True or False. Default is False.
1104 abbreviations. True or False. Default is False.
1105
1030 ``style``
1106 ``style``
1031 Name of style to use for command output.
1107 Name of style to use for command output.
1108
1032 ``timeout``
1109 ``timeout``
1033 The timeout used when a lock is held (in seconds), a negative value
1110 The timeout used when a lock is held (in seconds), a negative value
1034 means no timeout. Default is 600.
1111 means no timeout. Default is 600.
1112
1035 ``traceback``
1113 ``traceback``
1036 Mercurial always prints a traceback when an unknown exception
1114 Mercurial always prints a traceback when an unknown exception
1037 occurs. Setting this to True will make Mercurial print a traceback
1115 occurs. Setting this to True will make Mercurial print a traceback
1038 on all exceptions, even those recognized by Mercurial (such as
1116 on all exceptions, even those recognized by Mercurial (such as
1039 IOError or MemoryError). Default is False.
1117 IOError or MemoryError). Default is False.
1118
1040 ``username``
1119 ``username``
1041 The committer of a changeset created when running "commit".
1120 The committer of a changeset created when running "commit".
1042 Typically a person's name and email address, e.g. ``Fred Widget
1121 Typically a person's name and email address, e.g. ``Fred Widget
@@ -1045,6 +1124,7 b' User interface controls.'
1045 in a different hgrc file (e.g. ``$HOME/.hgrc``, if the admin set
1124 in a different hgrc file (e.g. ``$HOME/.hgrc``, if the admin set
1046 ``username =`` in the system hgrc). Environment variables in the
1125 ``username =`` in the system hgrc). Environment variables in the
1047 username are expanded.
1126 username are expanded.
1127
1048 ``verbose``
1128 ``verbose``
1049 Increase the amount of output printed. True or False. Default is False.
1129 Increase the amount of output printed. True or False. Default is False.
1050
1130
@@ -1077,21 +1157,27 b' The full set of options is:'
1077
1157
1078 ``accesslog``
1158 ``accesslog``
1079 Where to output the access log. Default is stdout.
1159 Where to output the access log. Default is stdout.
1160
1080 ``address``
1161 ``address``
1081 Interface address to bind to. Default is all.
1162 Interface address to bind to. Default is all.
1163
1082 ``allow_archive``
1164 ``allow_archive``
1083 List of archive format (bz2, gz, zip) allowed for downloading.
1165 List of archive format (bz2, gz, zip) allowed for downloading.
1084 Default is empty.
1166 Default is empty.
1167
1085 ``allowbz2``
1168 ``allowbz2``
1086 (DEPRECATED) Whether to allow .tar.bz2 downloading of repository
1169 (DEPRECATED) Whether to allow .tar.bz2 downloading of repository
1087 revisions.
1170 revisions.
1088 Default is False.
1171 Default is False.
1172
1089 ``allowgz``
1173 ``allowgz``
1090 (DEPRECATED) Whether to allow .tar.gz downloading of repository
1174 (DEPRECATED) Whether to allow .tar.gz downloading of repository
1091 revisions.
1175 revisions.
1092 Default is False.
1176 Default is False.
1177
1093 ``allowpull``
1178 ``allowpull``
1094 Whether to allow pulling from the repository. Default is True.
1179 Whether to allow pulling from the repository. Default is True.
1180
1095 ``allow_push``
1181 ``allow_push``
1096 Whether to allow pushing to the repository. If empty or not set,
1182 Whether to allow pushing to the repository. If empty or not set,
1097 push is not allowed. If the special value ``*``, any remote user can
1183 push is not allowed. If the special value ``*``, any remote user can
@@ -1099,6 +1185,7 b' The full set of options is:'
1099 must have been authenticated, and the authenticated user name must
1185 must have been authenticated, and the authenticated user name must
1100 be present in this list. The contents of the allow_push list are
1186 be present in this list. The contents of the allow_push list are
1101 examined after the deny_push list.
1187 examined after the deny_push list.
1188
1102 ``allow_read``
1189 ``allow_read``
1103 If the user has not already been denied repository access due to
1190 If the user has not already been denied repository access due to
1104 the contents of deny_read, this list determines whether to grant
1191 the contents of deny_read, this list determines whether to grant
@@ -1109,13 +1196,16 b' The full set of options is:'
1109 special value ``*`` is equivalent to it not being set (i.e. access
1196 special value ``*`` is equivalent to it not being set (i.e. access
1110 is permitted to all users). The contents of the allow_read list are
1197 is permitted to all users). The contents of the allow_read list are
1111 examined after the deny_read list.
1198 examined after the deny_read list.
1199
1112 ``allowzip``
1200 ``allowzip``
1113 (DEPRECATED) Whether to allow .zip downloading of repository
1201 (DEPRECATED) Whether to allow .zip downloading of repository
1114 revisions. Default is False. This feature creates temporary files.
1202 revisions. Default is False. This feature creates temporary files.
1203
1115 ``baseurl``
1204 ``baseurl``
1116 Base URL to use when publishing URLs in other locations, so
1205 Base URL to use when publishing URLs in other locations, so
1117 third-party tools like email notification hooks can construct
1206 third-party tools like email notification hooks can construct
1118 URLs. Example: ``http://hgserver/repos/``.
1207 URLs. Example: ``http://hgserver/repos/``.
1208
1119 ``cacerts``
1209 ``cacerts``
1120 Path to file containing a list of PEM encoded certificate
1210 Path to file containing a list of PEM encoded certificate
1121 authority certificates. Environment variables and ``~user``
1211 authority certificates. Environment variables and ``~user``
@@ -1144,15 +1234,18 b' The full set of options is:'
1144
1234
1145 ``cache``
1235 ``cache``
1146 Whether to support caching in hgweb. Defaults to True.
1236 Whether to support caching in hgweb. Defaults to True.
1237
1147 ``contact``
1238 ``contact``
1148 Name or email address of the person in charge of the repository.
1239 Name or email address of the person in charge of the repository.
1149 Defaults to ui.username or ``$EMAIL`` or "unknown" if unset or empty.
1240 Defaults to ui.username or ``$EMAIL`` or "unknown" if unset or empty.
1241
1150 ``deny_push``
1242 ``deny_push``
1151 Whether to deny pushing to the repository. If empty or not set,
1243 Whether to deny pushing to the repository. If empty or not set,
1152 push is not denied. If the special value ``*``, all remote users are
1244 push is not denied. If the special value ``*``, all remote users are
1153 denied push. Otherwise, unauthenticated users are all denied, and
1245 denied push. Otherwise, unauthenticated users are all denied, and
1154 any authenticated user name present in this list is also denied. The
1246 any authenticated user name present in this list is also denied. The
1155 contents of the deny_push list are examined before the allow_push list.
1247 contents of the deny_push list are examined before the allow_push list.
1248
1156 ``deny_read``
1249 ``deny_read``
1157 Whether to deny reading/viewing of the repository. If this list is
1250 Whether to deny reading/viewing of the repository. If this list is
1158 not empty, unauthenticated users are all denied, and any
1251 not empty, unauthenticated users are all denied, and any
@@ -1167,49 +1260,66 b' The full set of options is:'
1167 the list of repositories. The contents of the deny_read list have
1260 the list of repositories. The contents of the deny_read list have
1168 priority over (are examined before) the contents of the allow_read
1261 priority over (are examined before) the contents of the allow_read
1169 list.
1262 list.
1263
1170 ``descend``
1264 ``descend``
1171 hgwebdir indexes will not descend into subdirectories. Only repositories
1265 hgwebdir indexes will not descend into subdirectories. Only repositories
1172 directly in the current path will be shown (other repositories are still
1266 directly in the current path will be shown (other repositories are still
1173 available from the index corresponding to their containing path).
1267 available from the index corresponding to their containing path).
1268
1174 ``description``
1269 ``description``
1175 Textual description of the repository's purpose or contents.
1270 Textual description of the repository's purpose or contents.
1176 Default is "unknown".
1271 Default is "unknown".
1272
1177 ``encoding``
1273 ``encoding``
1178 Character encoding name. Default is the current locale charset.
1274 Character encoding name. Default is the current locale charset.
1179 Example: "UTF-8"
1275 Example: "UTF-8"
1276
1180 ``errorlog``
1277 ``errorlog``
1181 Where to output the error log. Default is stderr.
1278 Where to output the error log. Default is stderr.
1279
1182 ``hidden``
1280 ``hidden``
1183 Whether to hide the repository in the hgwebdir index.
1281 Whether to hide the repository in the hgwebdir index.
1184 Default is False.
1282 Default is False.
1283
1185 ``ipv6``
1284 ``ipv6``
1186 Whether to use IPv6. Default is False.
1285 Whether to use IPv6. Default is False.
1286
1187 ``logourl``
1287 ``logourl``
1188 Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``
1288 Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``
1189 will be used.
1289 will be used.
1290
1190 ``name``
1291 ``name``
1191 Repository name to use in the web interface. Default is current
1292 Repository name to use in the web interface. Default is current
1192 working directory.
1293 working directory.
1294
1193 ``maxchanges``
1295 ``maxchanges``
1194 Maximum number of changes to list on the changelog. Default is 10.
1296 Maximum number of changes to list on the changelog. Default is 10.
1297
1195 ``maxfiles``
1298 ``maxfiles``
1196 Maximum number of files to list per changeset. Default is 10.
1299 Maximum number of files to list per changeset. Default is 10.
1300
1197 ``port``
1301 ``port``
1198 Port to listen on. Default is 8000.
1302 Port to listen on. Default is 8000.
1303
1199 ``prefix``
1304 ``prefix``
1200 Prefix path to serve from. Default is '' (server root).
1305 Prefix path to serve from. Default is '' (server root).
1306
1201 ``push_ssl``
1307 ``push_ssl``
1202 Whether to require that inbound pushes be transported over SSL to
1308 Whether to require that inbound pushes be transported over SSL to
1203 prevent password sniffing. Default is True.
1309 prevent password sniffing. Default is True.
1310
1204 ``staticurl``
1311 ``staticurl``
1205 Base URL to use for static files. If unset, static files (e.g. the
1312 Base URL to use for static files. If unset, static files (e.g. the
1206 hgicon.png favicon) will be served by the CGI script itself. Use
1313 hgicon.png favicon) will be served by the CGI script itself. Use
1207 this setting to serve them directly with the HTTP server.
1314 this setting to serve them directly with the HTTP server.
1208 Example: ``http://hgserver/static/``.
1315 Example: ``http://hgserver/static/``.
1316
1209 ``stripes``
1317 ``stripes``
1210 How many lines a "zebra stripe" should span in multiline output.
1318 How many lines a "zebra stripe" should span in multiline output.
1211 Default is 1; set to 0 to disable.
1319 Default is 1; set to 0 to disable.
1320
1212 ``style``
1321 ``style``
1213 Which template map style to use.
1322 Which template map style to use.
1323
1214 ``templates``
1324 ``templates``
1215 Where to find the HTML templates. Default is install path.
1325 Where to find the HTML templates. Default is install path.
General Comments 0
You need to be logged in to leave comments. Login now