*: add executable bit to a few files that were missing it.

log: do case insensitive search for --user option

url: show realm/user when asking for username/password

rebase: abort message should appear even with --quiet

help: correct tip about deleting a subrepository The extra detail is not necessary, and wrong for Mercurial subrepositories, so remove it (suggested by Patrick Mézard).

revset: fix missing dot in docstring

help: fix typo in merge-tools topic

README: add small introduction

README: remove trailing blank line

i18n: translate revset predicate docstrings

i18n: extract docstrings from revset module

test-win32text.t: stabilize test output The test sometimes failed because f4.bat wasn't dirty. I'm not sure whether it should or shouldn't be dirty, but the extension is broken and deprecated and we just want to see the deprecation warning, so now we just avoid showing the dirtyness.

subrepo: propagate non-default pull/push path to relative subrepos (issue1852)

bookmarks: improve English for diffbookmarks

mq: expand 'repo' -> 'repository' in error message

mq: mark strings that should not be translated

qrestore: trying to improve the English

pull: silence spurious 'requesting all changes' message When issuing `hg pull -r REV` in a repo with no common ancestor with the remote repo, the message 'requesting all changes' is printed, even though only the changese that are ancestors of REV are actually requested. This can be confusing for users (see http://www.selenic.com/pipermail/mercurial/2010-October/035508.html). This silences the message if (and only if) the '-r' option was passed.

templates: fix inconsistency in 'help' link

test-patchbomb: add test for progress support (1ed2dc9d4368)

keyword: fix regressions introduced in d87f3ff904ba - dirstate of overwritten files must be forced to normal with kwexpand/kwshrink, not commit. - recorded files must be weeded before overwriting. - add test cases.

tests: test/silence win32text deprecation warning

lsprof: remove #!-line from non-executable script It triggered an rpmlint error, reported by Neal Becker.

doc/Makefile: do not include hg.1.gendoc.txt in MANIFEST It is an intermediate file used to produce the hg.1 and .hg.1.html files and is not useful for people who download the tarball. It will be regenerated automatically by the Makefile if users want to rebuild the documentation.

doc/Makefile: cleanup clean target

patchbomb: fix stray backslash in docstring While both '\ ' and '\\ ' parse the same in Python, the difference trips up hggettext so that it cannot find the docstring in the source file and thus cannot write the right line number to i18n/hg.pot. While the line number is not essential, it can be used to lookup the original message.

help: improve wording of internal:merge and internal:fail

win32text: give deprecation warning Users need to migrate to the EOL extension for various reasons. Instructions for disabling the warning will be added to the extension's wiki page.

merge with i18n

i18n-da: synchronize with b814f67d41c0

i18n: merge with main

i18n-da: synchronized with 3d6ba8c2b1b8

synchronized with 3d6ba8c2b1b8

traceback: point to BugTracker on the wiki

wix: add subrepos help text

version: replace email address with url to reduce private mail

Add subrepos help topic Edited by: Martin Geisler <mg@lazybytes.net> Dan Villiom Podlaski Christiansen <danchr@gmail.com>

hgrc: document [subpaths] section

merge-tools.txt: 6 comes after 5

Test applying context diffs

merge-tools.txt: fix typos, simplify, renumber from 1.

hggettext: handle i18nfunctions declaration for docstrings translations

Fix and unify transplant and bookmarks revsets doc registration

revsets: generate predicate help dynamically

help: add topic rewriting hooks They are useful when updating help topics dynamically from extensions.

minirst: ignore comments

help: add "revset" alias for "revsets" help topic

Makefile: var for documentation files

Makefile: remove underscore in var name

revset: add translator comments to i18n strings

gendoc: do not strip 'hg ' from synopsis This was an old left-over from when the synopsis line was used as a header. We now have the command name by itself as the header and the synopsis as a literal block immediately after..

gendoc: support multi-line synopses

gendoc: re-add indentation to global option table The indentation was lost in bdc1cf692447.

test-transplant: test transplanted() revset

backout: add --tool argument for specifying merge tool

help: improve merge-tools topic, describe --tool and clarify details This doesn't make it simpler, but it makes it more correct. With help from erikz, mg and abuehl.

help: use Windows cmd compatible quoting in revset help

color: give hint to translators about untranslated keywords

i18n: extract comments marked for translator hints Comments marked with "i18n:", like: # i18n: do not translate the field names msg = _("Valid entries for the format field are topic, bar, number.") will become available for translators in the .po files: #. i18n: do not translate the field names msgid "Valid entries for the format field are topic, bar, number." msgstr ""

setup/hg: handle hg being a symlink when appending relative libdir to sys.path Resolve symbolic links in the path to hg so that an hg that works when invoked directly will also work when invoked via a symlink to it.