Commit Graph

227 Commits

Author SHA1 Message Date
Steve Borho
aad9ecf6aa hgrc.5: document use of environment variables on Windows
This feature was introduced in c7a5a2c7063a
2010-02-15 20:28:42 -06:00
Matt Mackall
f4a529722f hgrc: update docs for the server section 2010-02-11 17:13:22 -06:00
Henrik Stuart
534ea9a0f8 doc: add missing documentation for http_proxy.always 2010-02-11 21:11:59 +01:00
Henrik Stuart
2d2f851cb8 url: SSL server certificate verification using web.cacerts file (issue1174) 2010-02-10 20:27:46 +01:00
Steve Borho
4bb4d09720 hgrc.5: Fix a typo 2010-02-08 06:24:34 -06:00
Steve Borho
9a5cb3aaab win32: allow hgrc.d on Windows 2010-02-07 05:34:22 -06:00
Martin Geisler
8664a6b426 Merge with stable. 2010-01-29 01:04:38 +01:00
Christian Ebert
42dde8faf8 hgrc.5: whether bcc is prompted for is up to the extension
There is no code in mail.py that forbids an extension to prompt for bcc.
2010-01-28 10:38:29 +00:00
Matt Mackall
cd3ef170f7 Merge with stable 2010-01-19 22:45:09 -06:00
Matt Mackall
595d66f424 Update license to GPLv2+ 2010-01-19 22:20:08 -06:00
Mads Kiilerich
3b9db3f9d9 Update test and man page for multiple matching encode/decode filters 2010-01-05 03:20:45 +01:00
Pascal Quantin
9e8542ebfd Update copyright year to 2010 2010-01-04 23:45:45 +01:00
Martin Geisler
8053426d1c hgrc.5: mark some words as inline literals 2009-11-11 21:45:13 +01:00
Martin Geisler
d8dd14a3aa hgrc.5: oft-requested "hg update" hook example 2009-11-11 20:08:26 +01:00
Martin Geisler
e2d8b0b8e1 doc: use titlecase in man page section titles 2009-11-08 11:46:38 +01:00
Martin Geisler
a734140a12 hgrc.5: do not mention "name: value" syntax
This was supported in versions prior to 1.3 where we used the standard
Python ConfigParser. The new config parser never supported it.
2009-11-07 18:47:04 +01:00
Martin Geisler
38d09c8d4d hgrc.5: mark more inline literals 2009-11-07 15:51:32 +01:00
Martin Geisler
1b91a31aa9 hgrc.5: do not turn random URLs into links
URLs and email addresses are automatically turned into links. We don't
want that when talking about example links and addresses.
2009-11-07 14:41:03 +01:00
Martin Geisler
7285aa3ae7 hgrc.5: use enumerated list for email charsets 2009-11-07 14:30:58 +01:00
Christian Ebert
966f02c857 hgrc.5: order of email charsets is not a top level literal block
- it belongs under email charsets, not email in general
- enumerate order
2009-11-07 13:54:47 +01:00
Martin Geisler
8ae9f6093b doc: add some internal links to man pages 2009-11-02 21:32:42 +01:00
Martin Geisler
7ad329e8b8 hgrc.5: combined short paragraphs into one
Short and precise sentences are good, but we can have more than one
such sentence per paragraph.
2009-11-02 21:08:33 +01:00
Martin Geisler
2ae29e4fd0 doc: use reST note directive
The 'NOTE: bla bla' syntax was for asciidoc and is still present in a
couple of docstrings. The docstrings will be converted to reST format
when minirst knows how to handle it.
2009-11-02 21:02:56 +01:00
Martin Geisler
77e5054cc9 hgrc.5: capitalize True and False consistently 2009-11-02 20:53:34 +01:00
Martin Geisler
0d60e93784 hgrc.5: document ui.traceback setting 2009-11-02 20:50:30 +01:00
Adrian Buehlmann
da618c2315 hgrc.5.txt: mention hgrc categories with higher precedence first
Reordering the FILES section accordingly.

The previous ordering of categories might have been nice from the
viewpoint of a site admin doing an initial install, but presenting a
higher-precedence-first ordering is more relevant and natural for the
average end user, since he will most likely resort to editing rc files
in the order of their precedence, overriding whatever "sane" defaults
are coming from more general files.

Note that this patch does not change the texts, it just moves them.
So, whatever bugs, grammar errors, or typos may have been in the texts
before this patch: they are still there. On purpose. Because this patch
here does not want to reword texts while moving them.
2009-10-21 13:40:55 +02:00
Adrian Buehlmann
b4da330562 doc/hgrc.5.txt: deprecate [defaults]
Quoting Matt:

"Defaults are a bad idea. They are deprecated. Don't use them. Don't
recommend them. Forget they existed. Use aliases."

in http://selenic.com/pipermail/mercurial-devel/2009-October/016095.html
2009-10-22 00:46:54 +02:00
Martin Geisler
bd199c7536 doc, help: stream-line use of inline-literals 2009-10-20 22:43:17 +02:00
Adrian Buehlmann
75ad7600e0 doc: clarify license footers
Mercurial is licensed under version 2 of the GPL
2009-10-01 11:40:53 +02:00
Martin Geisler
8de4494620 doc: add TOC to hg.1.html and hgrc.5.html 2009-09-04 22:26:57 +02:00
Martin Geisler
e2912b8950 Merge with crew-stable 2009-08-22 10:52:53 +02:00
Martin Geisler
b139d35cc0 hgrc.5: document %unset directive 2009-08-22 10:50:29 +02:00
Martin Geisler
73b766980d Merge with crew-stable 2009-08-22 01:37:28 +02:00
Martin Geisler
96c88eb0e0 hgrc.5: document %include directive 2009-08-22 01:34:56 +02:00
Dirkjan Ochtman
d96058fd14 hgweb: add web.descend configuration variable 2009-08-19 12:47:04 +02:00
Martin Geisler
6d834b7cc4 doc: link man pages to one another 2009-07-16 23:25:26 +02:00
Martin Geisler
47b638b157 doc: fixup font markup in man pages
This exposed a bug in rst2man where it neglects to escape a literal
backslash. A patch has been applied upstream, but not yet packaged in,
say, Debian unstable. A forward-compatible work-around has therefore
been put in place.
2009-07-16 23:25:26 +02:00
Martin Geisler
92882a99d0 doc: use reStructuredText for man and HTML pages
The Makefile now requires the rst2html and rst2man programs. Both can
be found in Debian testing or downloaded from the Docutils homepage:

  http://docutils.sf.net/
  http://docutils.sf.net/sandbox/manpage-writer/

The new HTML and man pages no longer contain huge amounts of
un-wrapping literal blocks, thanks to how snippets of reStructuredText
can easily be included inside other reStructuredText documents.

The HTML pages now have anchors for all sections, including the help
topics in hgrc.1 which were missing from the old HTML pages.
2009-07-16 23:25:26 +02:00
Martin Geisler
6606fddaf6 hgrc.5: remove reference to DEFAULT section 2009-06-23 15:51:27 +02:00
Martin Geisler
018713a8e9 hgrc.5: mark more literal strings 2009-06-23 15:50:32 +02:00
Martin Geisler
0e4c4d2cd4 hgrc.5: markup compromis compatible with 7.1.2 and 8.4.5 2009-06-23 15:16:19 +02:00
Henrik Stuart
972f154635 url: support client certificate files over HTTPS (issue643)
This extends the httpshandler with the means to utilise the auth
section to provide it with a PEM encoded certificate key file and
certificate chain file. This works also with sites that both require
client certificate authentication and basic or digest password
authentication, although the latter situation may require the user to
enter the PEM password multiple times.
2009-06-20 10:58:57 +02:00
Patrick Mezard
c1548a6a3e Add patch.eol to ignore EOLs when patching (issue1019)
The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.
2009-06-15 00:03:26 +02:00
Martin Geisler
eed2dde24c doc: wrap man pages after fixing quoting 2009-06-11 17:29:14 +02:00
Martin Geisler
20440a9594 hgrc.5: fix quoting of literal strings
The quotes would go wrong in many places due to differences between
asciidoc version 8.2.7 used by Benoit and 8.4.5 used by me. Between
those versions asciidoc stopped interpreting the content of `quoted
strings`, and so `*` would start bold text in the old version, but do
nothing in the new version.

To complicate things further, `\*` would escape the bold tag in the
old version, but in the new version the backslash was inserted
literally into the output (because the backtick quotes it).

I've now replaced backticks with non-quoting plusses and escaped
backslashes as appropriate.
2009-06-11 17:19:48 +02:00
Benoit Boissinot
89aac29846 doc: correctly escape * 2009-06-10 03:10:46 +02:00
Martin Geisler
6d7eccbdcc hgrc.5: spell check 2009-06-10 00:55:57 +02:00
Martin Geisler
bc5c193ce2 man pages: add meta data
This removes the fixme's that were otherwise inserted.
2009-06-10 00:46:30 +02:00
Martin Geisler
f88e959011 man pages: updated copyright years 2009-06-10 00:13:08 +02:00
Martin Geisler
a5e22ab2f7 hgrc.5: use NOTE admonition paragraph 2009-06-10 00:11:24 +02:00
Martin Geisler
25c277802b hgrc.5: reformatted to avoid big chunks of monospaced text
The man page used to have lines longer than 80 characters, even though
all lines in the hgrc.5.txt file were wrapped nicely. The problem
turned out to be that the indented paragraphs started literal blocks
instead of normal paragraphs. The literal blocks were of course not
wrapped when displayed by man.

In short, the asciidoc rules require lists to be formatted like this:

foo::
  Some description of foo.
+
Another paragraph in the description of foo. It *must* start flush
left and the plus is necessary to indicate that this is a list item
continuation.

Lists with nested lists can be formatted correctly using something
called "open blocks". These blocks are used to group the list items
and are marked by a line above and below with two dashes. See the
asciidoc user guide for the gory details...
2009-06-10 00:06:20 +02:00
Martin Geisler
f4b6037b5b hgrc.5: mark filename patterns as monospaced text 2009-06-09 23:26:16 +02:00
Martin Geisler
6f8338698b hgrc.5: single quotes means italic in asciidoc
Use double quotes instead and mark the * as monospaced text.
2009-06-09 23:24:43 +02:00
Martin Geisler
c4cdb96344 man pages: mark filenames and env vars as fixed text 2009-06-09 23:08:55 +02:00
Martin Geisler
95425236a2 hgrc.5: wrap lines at 70 chars (whitespace cleanup) 2009-06-08 00:14:24 +02:00
timeless
0bd3444de9 hgrc.5: language fixes 2009-06-07 17:34:12 +02:00
Christian Ebert
acc65a6303 hgrc.5: wrap manpage at 80 chars
Checked with asciidoc 8.4.5
2009-06-01 02:17:57 +02:00
Brendan Cully
5189b36798 Move alias into core 2009-05-30 11:32:23 -07:00
Martin Geisler
1a65fd1163 Merge with stable. 2010-01-05 22:41:39 +01:00
Patrick Mezard
7d0eedb075 patch: fix eolmode=auto with new files
If target file does not exist or has no eol, current code was normalizing eols
to LF. Preserve patch file eols instead.
2009-12-23 19:31:47 +01:00
Martin Geisler
8a5bf57c34 patch: implement patch.eol=auto mode
EOLs in patched files are restored to their original value after
patching. We use the first EOL found in the file, files with
inconsistent EOLs will thus be normalized during this process.
2009-12-20 17:18:04 +01:00
Brodie Rao
f244d61202 hgrc.5: fix label delimiter 2009-05-09 15:08:46 -04:00
Sune Foldager
4a665141b4 allow http authentication information to be specified in the configuration 2009-05-04 20:26:27 +02:00
Nicolas Dumazet
6ebdee6dde profiling: Adding support for kcachegrind output format, using lsprofcalltree 2009-04-08 14:20:57 +02:00
Nicolas Dumazet
f2cfd93c8c profiling: Adding a profiling.format config variable
Allows defining other output formats for profiling.

If an invalid format is given, output a warning and ignore it.
For now, only the standard 'text' value is supported.
2009-04-02 16:01:30 +09:00
Nicolas Dumazet
14ff1a53ae profiling: Adding profiling.output config variable
If specified, outputs profiling data to the said file.
Prints to stderr by default
2009-04-08 14:19:41 +02:00
Alexander Solovyov
609db13729 ability to load hooks from arbitrary python module 2009-03-27 01:28:09 +02:00
Christian Ebert
d66ba973f0 hgrc 5: fix email.charsets documentation 2008-12-02 15:31:48 +01:00
Mark Edgington
bf5852441b hgweb: support for deny_read/allow_read options
reimplementation of a patch provided by Nilton Volpato.

Folded into a single patch by Thomas Arendsen Hein.
2008-10-31 15:28:06 +01:00
Christian Ebert
44f3c4c080 hgrc.5: explain order of mail.charsets
TODO: add mail.charsets section to hgrc.5.ja.txt
2008-10-22 11:57:20 +02:00
Thomas Arendsen Hein
78d2b2a81c Document config option format.usefncache and improve format.usestore docs. 2008-10-24 14:58:24 +02:00
Christian Ebert
3ecc265292 Document email.charsets in hgrc.5
hgrc.5.ja.txt probably should include an example like:

[email]
charsets = iso-8859-1, iso-8859-15, windows-1252, iso-8859-2,
           windows-1250, iso-2022-jp, iso-2022-jp-ms
2008-10-16 17:08:46 +02:00
Benoit Boissinot
0c4a5ee0aa ui: add an option to prompt for the username when it isn't provided
When ui.askusername is set and not username are specified on the command line,
in hgrc or in the variables $HGUSER or $EMAIL, then hg will prompt for the
username.
Feature requested, and documentation provided by Mark Edgington.
2008-08-06 15:10:05 +02:00
Adrian Buehlmann
ce4d2eca37 doc/hgrc.5.txt: add anchors for sections
Enables links into hgrc.5.html of the form: hgrc.5.html#section
2008-05-14 01:08:51 +02:00
Christian Ebert
592b27aad1 asciidoc: consistently use 1 space after full stop
Note: the command doc strings included in hg (1) are still
      inconsistent wrt to spaces after full stops.
2008-04-01 14:35:35 +02:00
Christian Ebert
cbc606291c hgrc.5: fix subsection formatting 2008-04-01 14:35:11 +02:00
Matt Mackall
4794cecf39 pager: remove pager code from core 2008-03-20 11:12:35 -05:00
Peter Arrenbrecht
8a1366afb6 make hgrc man page tell about ~/.hgrc on Windows 2008-03-07 16:19:46 +01:00
David Soria Parra
fba7246b03 Use the pager given by the environment to display long output
Unix systems usually have a PAGER environment variable set.
If it is set, mercurial will use the pager application to display
output.

Two configuration variables are available to influence the behaviour of the
pager. ui.pager sets the pager application. The pager is
only used if ui.usepager is true. By default ui.usepager is disabled.
2008-03-18 22:12:34 +01:00
Thomas Arendsen Hein
deb94bc7fe Removed trailing spaces from everything except test output 2008-03-07 00:24:36 +01:00
Thomas Arendsen Hein
da3b50be51 Add config option to disable putting .hg_archival.txt inside archives. 2008-02-28 22:39:59 +01:00
Steve Borho
6ccb1552b6 add explicit extension disabling syntax to hgrc.5 2008-02-26 06:25:11 -06:00
Thomas Arendsen Hein
6f399a19b1 merge backout 2008-02-18 19:21:33 +01:00
Thomas Arendsen Hein
4d33c02751 Backed out changeset 8105fa3c7347 (see issue971/msg5317) 2008-02-18 19:20:22 +01:00
Bryan O'Sullivan
dfa3e1ea9b profiling: allow CGI and FastCGI to be profiled 2008-02-01 13:09:45 -08:00
Michele Cella
3d9c1412dd added an entry about the prefix option inside the hgrc man page 2008-01-22 23:07:23 +01:00
Thomas Arendsen Hein
1566cda979 Don't let ui.username override web.contact (issue900)
63beab327d26 introduced using ui.username before web.contact, but this was
never documented and might cause commit accidents.

- Drop web.author (deprecated since 2005)
- Try ui.username or $EMAIL as a fallback to display something useful.
- Update docs for the fallbacks.
2008-01-01 17:07:15 +01:00
Jesse Glick
47211365ca man 5 hgrc implied you need to use external tools to do CRLF translation.
This is no longer true; win32text provides a much better in-process alternative.
2007-12-20 07:46:47 -08:00
Matt Mackall
a172f3448b doc: correct preoutgoing description 2007-12-10 10:23:56 -06:00
Steve Borho
6d589928ab win32: read system rcpath from registry
Using the module name was not always helpful.  It breaks down
when Mercurial is installed as source and when the Mercurial
libs are used by external applications.

This patch allows Mercurial installers to store the system wide
rcpath in the registry, where it can always be found.  HGRCPATH
is a poor option for storing the system wide rcpath, since it
overrides both the system and user rcpaths.
2007-12-02 17:15:03 +01:00
Steve Borho
a42f97b40e filemerge: add 'checkchanged' merge tool property 2008-02-06 20:32:06 -06:00
Steve Borho
434a24dd1b add merge sections to hgrc.5 2008-01-31 22:32:11 -06:00
Bryan O'Sullivan
b945cf7339 profile: expand PID in output file name 2008-02-01 13:31:46 -08:00
Thomas Arendsen Hein
001b7980f8 Remove trailing spaces 2007-08-07 10:24:33 +02:00
Thomas Arendsen Hein
61d51838df New config option: ui.report_untrusted (defaults to True) 2007-06-25 22:41:15 +02:00
Thomas Arendsen Hein
f4d1e9e360 Fixed sorting inside nearly sorted sections in hgrc.5 2007-06-24 11:17:49 +02:00
Markus F.X.J. Oberhumer
974b7c5201 Add option "hidden" to hgwebdir.
TODO: should this option be renamed to 'hide_from_index' or
maybe to 'index_ignore' (like Apache's mod_autoindex) ?
2007-06-25 14:46:20 +02:00
OHASHI Hideya
83f32e7ff9 Enable to select encoding in hgrc web section
This patch provides character encoding setting in each repository. After this
patch, You can use multi encoding repositories with one mercurial server.
2007-06-13 18:18:06 +09:00
Thomas Arendsen Hein
f1c2183cb0 Backed out changeset 6e4b2043f10ea50b3eeb0ceb3e8776032fb8d92e
Only printenv was changed, not the actual execution of hooks.
And not setting an empty value might cause problems on platforms
which can't always remove variables from the environment.
2007-06-21 10:00:59 +02:00
Thomas Arendsen Hein
4df6409ef2 Adjust note about variables not being set for empty values. 2007-06-21 09:45:33 +02:00