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.

check-code: introduce function for using re2 when available Do it similar as in mercurial.util. For simplicity only support flag multiline which is the only one used.

check-code: compile filters when loading

check-code: compile all patterns on initialisation They where compiled once for every checked file (when calling finditer).

check-code: only fix patterns once The patterns were fixed once for every file. Now only do it once when loading the file.

merge with stable

commit: amending with --close-branch (issue3445) You can't close a branch that hasn't got a head. newbranch + commit --close-branch must fail newbranch + commit + commit --amend --close-branch must fail You must not be allowed to close a branch that is not defined.

run-tests: simplify interrupted message

run-tests: remove spurious disable of --time with --debug