merge with i18n

i18n-ja: synchronized with 6f6f6a9c2a41

i18n-pt_BR: synchronized with db2ff771204d Reviewed formatting fixes from eda77c3e246a.

i18n-da: translate help for bookmarks extension

i18n, bookmarks: add comments for translators

i18n-da: synchronize with e1855dee28c1

qnew: distinguish between existing file and directory (issue2464)

qnew: give better feedback when doing 'hg qnew foo/' (issue2464)

opener: do not create "foo" directory when writing to "foo/" The directories were not cleaned up when the subsequent open failed and this would confuse things like qnew.

pager: backout 05077896ffe2 (issue2441)

mq: qrename should not touch the dirstate if src is untracked (issue2460)

patch: fix copies when patching over uncommitted changed (issue2459)

merge with i18n

i18n-pt_BR: synchronized with 830be2c57626

i18n-pt_BR: msgmerge with 830be2c57626

merge with i18n

i18n-da: remove extra newline in translation

i18n-da: synchronize with 6137c5bba4d0

minirst: use colwidth to match title lengths (issue2455)

encoding: default ambiguous character to narrow The current implementation of colwidth was treating 'A'mbiguous characters as wide, which was incorrect in a non-East Asian context. As per http://unicode.org/reports/tr11/#Recommendations, we should instead default to 'narrow' if we don't know better. As character width is dependent on the particular font used and we have no idea what fonts are in use, this recommendation applies. This introduces HGENCODINGAMBIGUOUS to get the old behavior back.

*: kill all unnecessary shebangs.

*: 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.

merge-tools: fixed typos Spotted by Patrick Mézard.

commands: mark tip:0 as literal text If left unquoted, this is seen as a link to '0' using protocol 'tip' because of some over-eager link-finding magic in Docutils.

eol: add missing word in module docstring

demandimport: backout fe31f834a9ff Using a keyword argument here breaks zipimporter for at least some versions of Python2.6 on Windows.

dispatch: backout 0c605364373c The parenthesis may need translation too: Laurens Holst pointed out that Japanese uses full-width parentheses: （） (U+FF08 U+FF09).

subrepo: svnsubrepo._wcrev should return str after 3d6ba8c2b1b8

subrepo: fix status check on SVN subrepos (issue2445)

hgweb: let HTTPS serve use more compatible and less secure encryption PROTOCOL_SSLv3 on the server side doesn't work everywhere. Sometimes the client reports "EOF occurred in violation of protocol" (for example on Mac and Solaris). The more compatible PROTOCOL_SSLv23 is now used instead. It works but is less "secure" for some OpenSSL versions as it can fall back to weak encryption.

mercurial.el: fix hg-outgoing path when 'default-push' is not defined hg-outgoing path is set as 'default-push' which prevents it from working in repos which only have 'default' defined. Fix provided by Kyujin Shim at http://alexott.net/en/writings/emacs-vcs/EmacsMercurial.html

merge default into stable for 1.7 freeze

merge with stable

patchbomb: hide passwords potentially embedded in urls

wix: add vim syntax file for Mercurial unit tests

wix: add new help page templates

wix: add new merge-tools.txt help text

Merge with mpm

merge: implement --tool arguments using new ui.forcemerge configurable ui.forcemerge is set before calling into merge or resolve commands, then unset to prevent ui pollution for further operations. ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the given --tool is not found by the merge-tools machinery. This makes it possible to do: hg resolve --tool="python mymerge.py" FILE With this approach, HGMERGE and ui.merge are not harmed by --tool

tests: fix up changed output

revset: disable subset optimization for parents() and children() (issue2437) For the boolean operators, the subset optimization works by calculating the cheaper argument first, and passing the subset to the second argument to restrict the revision domain. This works well for filtering predicates. But parents() don't work like a filter: it may return revisions outside the specified set. So, combining it with boolean operators may easily yield incorrect results. For instance, for the following revision graph: 0 -- 1 the expression '0 and parents(1)' should evaluate as follows: 0 and parents(1) -> 0 and 0 -> 0 But since [0] is passed to parents() as a subset, we get instead: 0 and parents(1 and 0) -> 0 and parents([]) -> 0 and [] -> [] This also affects children(), p1() and p2(), for the same reasons. Predicates that call these (like heads()) are also affected. We work around this issue by ignoring the subset when propagating the call inside those predicates.

check-code: warning and fixes for whitespace in unified tests

hgweb: use Pythons ssl module for HTTPS serve when using Python 2.6 or later pyOpenSSL apparently doesn't work for Python 2.7 and isn't very actively maintained. The built-in ssl module seems like a long-term winner, so we now use that with Python 2.6 and higher.

hgweb: refactor all pyOpenSSL references into one class

gendoc: added styling for extension TOC Uses CSS3 columns for the list of extensions, so it is not just a long list of extension names.

gendoc: automatically create help for default extensions. Adds a section in the hg.1 manpage and corresponding hg.1.html file. Each extension is listed with its module docstring, followed by the commands defined by that extendsion. Creates help for extensions by extracting doc strings from the extension modules and its commands.

gendoc: dedent documentation from docstrings When getting docstrings from the source they are indented to look good in the code. This indentation interferes with how the text is parsed by rst. Therefore this indentation is removed.

extensions.load: return module Makes extensions.load return the module that it has loaded. This is done so that callers can get information on this module, which e.g. can be used for generating docs.

help: different section separators Changes the characters used as section separators, so different ones are used for module docstring and command docstring. This is done because the section from the docstring will be at different levels in the restructured text output, therefore different symbols have to be used.

gendoc: add subsection for each command

gendoc: move section commands to module scope

mq: mark string for i18n

cmdutil: mark string for i18n

test-ssh: handle very slow ssh transfer rate

bookmarks: add paragraph on pushing and pulling to help Text adapted from http://mercurial.selenic.com/wiki/BookmarksExtension

help: help topic for merge tools I have made a help topic for merge tools. The text in the topic is based on the http://mercurial.selenic.com/wiki/MergeProgram page from the wiki, along with some extra information on the internal merge tools.

check-code: find trailing whitespace

convert: kill trailing whitespace

convert: fix typo in comment

strip: support revision sets

interhg: use uisetup() instead of module-load side effects This fixes an infinite recursion bug caused by visiting a bad subpage of the help handler repeatedly, which caused the wrapper for the templater's escape filter to get installed twice and resulted in infinite recursion.