Added tag 2.6.3 for changeset 009794acc6e3

merge with i18n

i18n-ja: synchronized with ec17ddecdf64

merge with stable

merge with i18n

i18n-fr: remove duplicate paragraphs The paragraphs were added as part of the automatic conversion in 42b46d3cb366. Thanks to Timeless for the initial patch.

i18n-fr: remove extra empty line at end of msgtr

i18n-fr: fix malformed literal blocks

i18n-fr: remove extra trailing newline

i18n-it: remove extra trailing newlines

i18n-sv: fix malformed literal block

i18n-de: remove extra format character

i18n-de: add missing format character

i18n-de: add missing newline

i18n-de: add missing heading underline

i18n-de: use same format character as in msgid

i18n-de: remove duplicate paragraph It was added in the automatic conversion done in f837e7ea0e73.

i18n-de: fix malformed note directive

i18n-de: remove extra format character

i18n-de: add missing literal block

i18n-it: remove extra trailing newline and fix translation Thanks to Timeless for flagging the extra newline.

i18n-de: remove bad fuzzy translations These were flagged because they had the wrong number of format characters. Reviewed by Martin Geisler to ensure that the translation couldn't be easily updated to the correct number of format characters.

i18n-da: remove bad fuzzy translation Reviewed by Martin Geisler.

i18n-da: remove extra trailing newline

i18n-da: add missing newline

i18n-da: remove extra trailing newline and fix translation Thanks to Timeless for flagging the extra newline.

i18n-da: add missing format character and fix translation Thanks to Timeless for flagging the missing format character.

i18n-da: add missing heading underline

i18n-da: remove bad fuzzy translation

i18n-da: add missing format character and fix translation Thanks to Timeless for flagging the missing format character.

i18n-el: add missing indention for literal block Thanks to Timeless for flagging this.

i18n-el: remove extra newline

i18n-el: remove duplicate paragraphs They were added in the conversion done in 8ef2cd109dc6.

i18n-zh_CN: remove duplicate paragraphs They are added in the automatic conversion in e5b7841e0008.

i18n-zh_CN: add missing literal blocks

i18n-zh_CN: remove duplicate paragraphs

i18n-ru: spell "ElementTree" correctly

i18n-ru: fix translated config section

merge with crew

tests: simplify and document the sorting of pyflake messages The pyflake messages are simply ordered by message type, path, line no (and message text). The message type is taken from the order of the filters. The previous ordering looks complicated and illogically. It was the following order (r'\3:\5:\4:\1:\2:' + line): message (\3 and \5) var name (\4) path (\1) line no (\2) line reference Ordering by var name before path looks illogically for me.

bundle: move file chunk generation to it's own function Moves the file chunk generation part of bundle creation to it's own function. This allows extensions to customize the filelog part of bundle generation.

parents: change parents command to use filectx Changes the parents command to use filectx to look up the change node instead of doing it manually. This allows extensions to modify the file-to-commit relationship behind the filectx api.

update: remove .hg/graftstate on clean (issue3970) e078ea9b4ce4 introduced a check for interrupted grafts while committing. This exposed a bug where hg update --clean didn't remove that file.

i18n-pt_BR: synchronized with b500a663a2c7

templater: add strip function with chars as an extra argument This allows specifying characters to strip, like the Python strip function.

Merge with main.

revlog: add exception when linkrev == nullrev When we deployed the latest crew mercurial to our users, a few of them had issues where a filelog would have an entry with a -1 linkrev. This caused operations like rebase and amend to create a bundle containing the entire repository, which took a long time. I don't know what the issue is, but adding this check should prevent repos from getting in this state, and should help us pinpoint the issue next time it happens.

merge with stable

revlog: add exception when linkrev == nullrev When we deployed the latest crew mercurial to our users, a few of them had issues where a filelog would have an entry with a -1 linkrev. This caused operations like rebase and amend to create a bundle containing the entire repository, which took a long time. I don't know what the issue is, but adding this check should prevent repos from getting in this state, and should help us pinpoint the issue next time it happens.

changegroup: fix fastpath during commit Change 627cd7842e5d dropped the 'revset' variable which kept track of which changesets were being bundled. Instead, it used "not in commonset" to decide which changesets were outgoing.. which ran into trouble when a commit was in progress.

tests: do not print hgrc in test This lets test-rebase-cache.t pass also when --inotify or --extra-config-opt is specified.

contrib: delete setup3k in favor of setup --c2to3 setup3k was merged into setup in 7a7a1c594d. Now finally get rid of it.

cleanup: remove unused imports detected by pyflakes

tests: check-code more python files without py extension files found by running $ hg manifest | grep -v "\." | xargs file | grep python

dummyssh: fix check-code nit

test-pathencode: randomize length of each path component This makes it possible for long and short components to exist in the same path. This also makes shorter path components more likely. For randint(1, randint(1, n)), the likelihood that one sees a number k (1 <= k <= n) is 1/n * (\sum_{k=i}^n 1/i). This decreases with k, much like in the real world where shorter paths are more common than longer ones. The previous fix and this one together cause issue3958 to be detected by this test with reasonable frequency. When this test was run 100 times in a loop, the issue was detected 30 of those times.

test-pathencode: reduce makepart length requirement by 1 This allows path components of length 1 to be generated.

pathencode: fix hashmangle short dir limit (issue3958) The Python version of this (see mercurial/store.py:_hashencode) copies path components up to a limit of maxshortdirslen bytes. The Python version does not consider the initial "dh/" to be part of the this, though, while the C version currently does. Adding len("dh/") == 3 to the limit for the C version brings it in line with the Python version. This was not caught by the randomized testing scheme in test-pathencode.py because of a couple of flaws with the test. Upcoming patches will fix those problems.

docs: change description to synopsis in hgrc.5 Spotted by Eric S. Raymond.

run-tests: sort missing files first instead of raising an error sort first for early telling typos in test names

filectx: remove dependencies on filerev Removing dependencies on filectx.filerev() makes it easier to create a filelog implementation that doesn't have rev numbers.

hg: move return statement after finally block return is always run after finally block. Now we have same functionality, but clearer readability.

run-tests: call Threads constructor with keyword arguments This is suggested in the python documentation (on http://docs.python.org/2/library/threading.html#thread-objects)

run-tests: ignoring tests works again running with --retest did not work anymore because runone still returned None for this case. But this is not allowed since 6a127fa5de23.