Commit Graph

39 Commits

Author SHA1 Message Date
Brodie Rao
e6cef43d44 revsets: clarify in the help that head() returns named branch heads 2010-10-09 11:27:29 -05:00
Mads Kiilerich
2fcbe3473c merge with stable 2010-10-01 00:54:03 +02:00
Mads Kiilerich
665d2722d8 doc: clarify that https cert verification requires web.cacerts 2010-10-01 00:48:50 +02:00
Brodie Rao
5a1e1994ac help: refer to user configuration file more consistently
Currently, a number of commands and help topics mention the user hgrc
file in different ways. Among these are following:

1. .hgrc - "please specify your commit editor/username in your .hgrc
file", bookmarks, color, hgk, pager, hg help environment

2. $HOME/.hgrc - hg help paths, hgrc(5), hg(1)

3. ~/.hgrc - hgrc(5)

In addition to being inconsistent, none of these make sense on
Windows. This patch replaces the above with a more general term of
"[your] configuration file".
2010-08-27 22:36:35 -04:00
Brodie Rao
2104af5ee2 revset: support raw string literals
This adds support for r'...' and r"..." as string literals. Strings
with the "r" prefix will not have their escape characters interpreted.

This is especially useful for grep(), where, with regular string
literals, \number is interpreted as an octal escape code, and \b is
interpreted as the backspace character (\x08).
2010-09-24 15:36:53 -05:00
Dan Villiom Podlaski Christiansen
9c75aee050 templater: add hex filter. 2010-09-22 00:14:57 +02:00
Martin Geisler
c3c7fa090f Merge with stable 2010-08-30 13:00:22 +02:00
Matt Mackall
eef168b604 merge with stable 2010-08-19 10:25:41 -05:00
Dirkjan Ochtman
285c18754a help: document stringify templatefilter 2010-08-19 10:59:37 +02:00
Martin Geisler
5f4b538b5a glossary: fixed typo 2010-08-17 17:33:42 +02:00
Martin Geisler
f39e256b0e glossary: add entry for "Branch, inactive" 2010-08-17 13:59:37 +02:00
Wagner Bruna
64365a9e84 revset: predicate to avoid lookup errors
A query like

head() and (descendants("bad") and not descendants("fix"))

(testing if repo heads are affected by a bug) will abort with a
RepoLookupError if either badrev or fixrev aren't found inside
the repository, which is not very informative.

The new predicate returns an empty set for lookup errors, so

head() and (descendants(present("bad")) and not descendants(present("fix")))

will behave as wanted even if those revisions are not found.
2010-08-13 13:11:41 -03:00
Matt Mackall
c0507148ea merge with stable 2010-08-17 13:22:20 -05:00
Martin Geisler
0d581ef071 Merge with stable 2010-08-17 17:27:37 +02:00
Matt Mackall
9cc346f0b4 help: fix bytes/digit confusion for hashes
spotted by FUJIWARA Katsunori <fujiwara@ascade.co.jp>
2010-07-31 18:27:03 -05:00
Nicolas Dumazet
5ab42d56dc revset: add min function 2010-07-30 10:07:46 +09:00
Patrick Mezard
3153012325 cleanup: typos 2010-07-26 22:29:49 +02:00
Patrick Mezard
8314d853e5 revsets.txt: minor improvements 2010-07-26 22:29:17 +02:00
Jason Harris
48d0722a3e templates: 'children' keyword
The template keyword 'parents' is already present and this just
provides the complimentary template keyword.
2010-07-03 05:24:16 +02:00
Renato Cunha
9116007193 glossary: fixed typo in "Directory, working" description
The term "Directory, working" referenced a non-existant term named "Parents,
working directory". This patch fixes the typo.
2010-07-06 13:10:16 -03:00
Julian Cowley
56d348181d revset: fix spelling typo 2010-06-23 16:54:12 -10:00
Wagner Bruna
94fd1c3ad7 help: glossary.txt formatting fixes 2010-06-23 17:50:27 -03:00
Wagner Bruna
22d1edb0c2 help: fix glossary.txt named branches description 2010-06-23 17:49:49 -03:00
Matt Mackall
5e7ddd1612 revset: improve help on strings 2010-06-21 13:38:40 -05:00
timeless
f73c558130 Explain trust near hgrc in config help 2010-05-21 12:51:55 +03:00
Martin Geisler
66a319e69f help: new revsets topic
Based on a patch by timeless which in turn is based on

  http://selenic.com/pipermail/mercurial-devel/2010-June/021638.html
2010-06-17 17:21:39 +03:00
Faheem Mitha
45dd4bd055 help: add "glossary" topic
Joint work with Vishakh Harikumar, Pradeepkumar Gayam, David Champion,
Mark Booth, timeless, Matt Mackall, Heinrik Stuart, Greg Ward, and
Martin Geisler.
2010-06-16 15:20:22 +05:30
Matt Mackall
5e9a746cad Merge with stable 2010-04-29 22:14:14 -05:00
Dan Connolly
3a8d40d5c3 log: document the new xml style 2010-04-28 13:36:06 -05:00
Mads Kiilerich
c73d512d42 help config: update windows documentation to match implementation
This shows how confusing the current implementation is on Windows.
2010-04-26 16:36:08 +02:00
Matt Mackall
6f4ee16a11 help: add some help for hgweb.config files 2010-04-26 11:03:40 -05:00
Matt Mackall
fca8ca144d help: config.txt typo 2010-04-26 11:03:40 -05:00
Martin Geisler
f1853c5e82 Use hg role in help strings 2010-04-22 10:24:49 +02:00
Dirkjan Ochtman
f0296c2e69 help: point out need for stringification 2010-03-23 11:48:14 +01:00
Brodie Rao
48b845981a ui: add HGPLAIN environment variable for easier scripting
If HGPLAIN is set, the following settings are ignored when read from
hgrc files:

- ui.debug
- ui.fallbackencoding
- ui.quiet
- ui.traceback
- ui.verbose
- defaults.*

Localization is also disabled.

Equivalent options set via command line are honored.
2010-02-07 14:56:18 +01:00
Martin Geisler
3afd6f9898 Merge with stable 2009-12-23 18:40:57 +01:00
Martin Geisler
28b3a6e068 help/templates: use hanging indent for field list
Now that the field list indentation is computed automatically, we no
longer need to align all fields the same. Using a simple hanging
indent makes it easy to edit the text in an editor like Emacs, which
will automatically recognized the hang and keep it.

The fields are still output with no blank lines between them.
2009-12-14 00:02:04 +01:00
Patrick Mezard
f32df1c921 Make {file_copies} usable as a --template key
Before this, to display file copies in templates, you had to write something
like {file_copies%filecopy}. For some reason, the {file_copy} subtemplate was
used by default but not defined by default in changeset_templater, while styles
were already using it. Here we define {file_copy} in changeset_templater, and
change the templater to handle formatting strings like {file_copies%filecopy}
with already expanded keys (in this case {file_copies}), for backward
compatibility.
2009-12-13 18:06:24 +01:00
Dan Villiom Podlaski Christiansen
238d382291 setup: install translation files as package data
Remove the `install_package_data' subclass of `install_data' and use
the `package_data' functionality provided by distutils instead. As
package data must be located within the package directory, the data
files are now generated in the build directory.

To simplify the functionality of this change, the top-level `doc' and
`templates' directories have been moved into the `mercurial' package
directory.
2009-12-01 16:06:10 +01:00