merge with stable

merge with i18n

i18n-ru: fix spelling of "missing" equivalent

i18n-ru: synchronized with b131e24e2984

i18n-pt_BR: synchronized with b5c560787a4e

check-code: fix check for trailing whitespace on continued lines too The tests in test-annotate.t and test-import-git.t that relied on trailing space in a file created by a here string is now masked by a literal 'EOL' string that is removed.

check-code: fix check for trailing whitespace on empty lines It seems like the intention with c7d23b4ca4ba was to catch lines with only one whitespace too.

check-code: fix check for trailing whitespace on sh command lines The $ has been without necessary escaping since introduced in c7d23b4ca4ba.

Merge with stable

update: fix typo in help text Spotted by Kevin Chase <kevincha99@hotmail.com>

clone: don't fail with --update for non-local clones (issue3578) This was broken by 5884812686f7 due to lack of test coverage. This adds a test and fixes the defect.

merge with stable

merge with i18n

i18n-ru: synchronized with 474ae9720aa5

i18n-pt_BR: synchronized with e4db509c08ec

histedit, i18n: warn translators about edit command names

Merge with stable

histedit: sync docstring with edit comment The docstring should probably reuse the edit comment string instead.

templater: handle a missing value correctly Before, using a broken style such as: changeset = would result in a traceback. This fixes a regression introduced in 63c47e4ac617.

help/hgweb: fix spelling error

tests: remove stray test-convert-mtn-rename-directory.out

Merge with stable

context: simplify workingctx._parents

Added signature for changeset 7f5094bb3f42

Added tag 2.3 for changeset 7f5094bb3f42

test: fix typo in test comment

histedit: add proper locking around repair.strip() calls

rebase: remove second broken synopsis line (issue3172) Displaying multiple synopsis in online help has been broken since Matt RST refactoring, around ff26712a0c50. Rebase help is apparently the only one using this trick, just drop the second synopsis and assume people will understand as with graft help.

localrepo: clear the filecache on _rollback() and destroyed() This restores the old behaviour of clearing the filecache when the repo is destroyed but combines it with also clearing it on _rollback. Before, we tried to only call it through _rollback but that ruined callers of destroyed. Doing it on both code paths covers destroyed being called from somewhere else, e.g. strip.

help: add 'mergetools' alias for the 'merge-tools' help topic The '-' in 'merge-tools' is surprising but necessary in the configuration. Let's help those who forget that and are looking for help.

help: use the first topic name from helptable, not the longest alias This makes the 'additional help topics' list consistent with the output from keyword search (for instance subrepo/subrepos). The sorting by longest name was introduced in 3f6a4f1de43f. There might have been a good reason for it back then, but now it seems like a better idea to place the preferred name first in the list in helptable.

help: fix helptable indentation

transplant: fix emptied changeset message - Append an EOL - State the changeset is skipped

transplant: handle non-empty patches doing nothing (issue2806) If patch.patch() reports patched files when applying a changeset and the following commit says nothing changed, transplant used to abort with a RuntimeError, assuming something went wrong with patching. The mismatch is patch.patch() reports patched files, not changed ones. It could be modified to report changed files but it means duplicating work from status, may be expensive in the case of binary files, and is probably not that useful at API level. For instance, if two patches are applied on the working directory, the outcome may be nothing changed while each call would have returned modified files. The caller would have to call status() itself again. This patch fixes the issue by trusting patching code: if the patch succeeded and commit reports nothing changed, then nothing changed, patch() did not "dropped changes on the floor".

hgweb: fix graph view paging - Fix off-by-one error on displayed entries count in normal mode - Fix incorrect paging when the top revision was lower than revcount - Fix revcount not overriding web.maxshortchanges everywhere

help/config.txt: document web.maxshortchanges

help/config.txt: reorder [web] options

histedit: make comment part of the file describing rules as translatable "i18n.gettext()" invocation for "editcomment" itself should have little impact for whole initialization cost of histedit, because it is already invoked for initialization of the command table entry. '\n\n' has to be added to the text being edited separately from "editcomment", because leading 'line feed' characters are not exported to "hg.pot" file correctly.

merge with i18n

i18n-ru: synchronized with 85188487b9b4

i18n-ru: add missing space in summary output template

i18n-ru: synchronized with b616e4aacf96

i18n-ja: synchronized with 3339e3df159d

i18n-pt_BR: synchronized with e66fa4d587dc With review and suggestions by Sheila Genesine.

log: make opts entries optional (issue2423)

test-clone: fix for vfat fixes http://hgbuildbot.kublai.com/builders/vfat%20hg%20tests%20%28stable%29/builds/65

obsolete: fix typos in comments introduced by 6955d69a52a4

pager: drop -S option for less in example for pager configuration Using less -S will hide possibly important information when reviewing a changeset, e.g. something wrong/dangerous after the 80th column, because "less" will not give an indication that following characters are hidden.

obsolete: properly increment currentlen when building pushkey payload In the old code, the current length was always 0 leading to markers payload never being split.

hgweb: fixes invalid parents / children in comparison Previously, the parents / children were computed relative to the cset of the currently shown file, which was wrong and inconsistent with diff and others. With this patch, the listed csets are those that contain changes to the currently compared file, which don't necessarily have to be the direct parents and children of the changeset itself.

hgweb: fixes traceback for invalid files by removing top-level template The top-level 'comparison' template was not really needed, and it also caused a traceback to be shown for inexistent files (as reported by Ross Lagerwall). Getting rid of it makes the overall templating structure simpler and causes invalid files to be handled nicely.

merge with i18n

i18n-ja: synchronized with b087cfebc3ac

check-code: indent 4 spaces in py files

pushkey: do not exchange obsole markers if feature is disabled This apply to both push and pull both when client or server.

obsolete: warns if markers exist in a repo where the feature is not enabled We don't simply abort to allow the user to run other diagnostic commands.

obsolete: introduce an `_enabled` switch to disable the feature by default Obsolete markers wide-usage and propagation should be avoided by default until the obsolete feature is more mature. This changeset introduce the `_enable` variable and prevent the creation of obsolete marker if the feature is set to `False` (the default). More limitation comes in followup changesets.

pushkey: splits obsolete marker exchange into multiple keys Obsolete markers are now exchanged in smaller pieces that fit in a http header. This changes is done to avoid 400 bad request error when exchanging obsolete puskey over http. The last key pushed is always hold by the "dump0" key to ensure an easy place to hook for people who need it.

obsolete: add debug output regarding obsolete marker exchange.

pushkey: add more verbose debug output regarding pushkey Very few data are displayed now, making it hard to debug phases and obsolete related issues.