merge: add a files method to the mergestate class This will be used in the upcoming shelve extension.

histedit: raise ImportError when demandloading is enabled

run-tests: add --loop support This makes it easy to run tests repeatedly at high loads to look for test failures.

run-tests: --interactive and --jobs no longer conflict

run-tests: sort certain slow tests earlier by keyword There are a few tests that evade the size heuristic

run-tests: drop unused resultslock

run-tests: drop options.child and users

run-tests: remove runchildren, now unused

run-tests: schedule largest tests first

run-tests: introduce thread scheduler

run-tests: use count to calculate port to use This will keep threads from using the same server ports

run-tests: introduce threadtmp directory

run-tests: add abort flag This will be used to help threads clean up gracefully

run-tests: move more variables to env

run-tests: simplify env deletion

run-tests: move most of remaining environment tweaks

run-tests: move environment creation to a separate function

run-tests: move HGRCPATH to env

run-tests: move DAEMON_PIDS to env

run-tests: move HGPORT setting to env

run-tests: write tmp paths into env copy

tests: avoid writing files to HGTMP

run-tests: use env dict to kill daemons

run-tests: add env dict to isolate test environment

merge with stable

Added signature for changeset cceaf7af4c9e

Added tag 2.6.2 for changeset cceaf7af4c9e

merge with i18n

i18n-ja: synchronized with 9e5ab8d3154a

i18n-pt_BR: synchronized with b592fd33233a

i18n-ru: synchronized with 39ea540dc154

i18n-ru: synchronized with ddfdccc9d5a4

graft: refuse to commit an interrupted graft (issue3667)

run-tests: remove some unnecessary globals

run-tests: add a log function

run-tests: make vlog a proper function

run-tests: unify marks and result codes

run-tests: change return code of runone

run-tests: regroup some initialization checks

run-tests: fix a path existence check

run-tests: regroup some variable initialization

run-tests: regroup nested functions

run-tests: regroup temp dir creation

run-tests: pull hgrc creation out as function

tests: simplify handling of unknown test types

run-tests: filter out non-tests from default list

run-tests: make a table of test types

run-tests: don't need to test shebang any more

merge with stable

merge with i18n

i18n-pt_BR: synchronized with 2b4344f23b44

merge with stable

gendoc: extract print help topics into a dedicated function This will be used in an upcoming patch.

amend: complain more comprehensibly about subrepos

gendoc: make commnd __doc__ and extension __doc__ as translatable Before this patch, commnd __doc__ and extension __doc__ are not translatable. But other messages, like doc of helptalbe, section headers, are translatable. This patch makes commnd __doc__ and extension __doc__ translatable.

blackbox: fix blackbox causing exceptions in tests In the tests some scripts call reposetup with the base ui instead of the one the extensions have modified. This causes an exception in blackbox.reposetup since it expected a method to be there. So I just check for it first. This only happened when the blackbox extension was enabled during tests.

blackbox: fix recording exit codes (issue3938) Previously the blackbox wrapped runcommand, but this failed to see the error codes that were created if an exception occurred. I moved that logging to now wrap _runcatch, so it can observe and log the actual error code (such as when a user ctrl+c's during a command). Updated the tests as well. Tested the change by running all the tests with the blackbox extension enabled and verifying nothing broke (aside from things that printed what extensions were enabeld). The progress tests are affected by calls to time.time() so they needed to be updated to pass.

templater: add indentation arguments to the fill function

templater: move templatefilters.func into the same place as the other funcs

ui: merge prompt text components into a singe string This will help avoid problems with partial or mismatched translation of the components.

merge with stable

merge with i18n

i18n-ru: merge with Nikolaj Sjujskij fixes

i18n-ru: update po-file for further translation (from ddc7a6be2021)

merge in i18n-ru

i18n-ru: fix patchbomb confirmation prompt (issue3929) Recognize y(es) and (n)o as valid input, for user not to have to switch keyboard layout twice (`hg email -o ...` is Latin, whereas д(а)/н(ет) are not). Use capital Y/N letters in prompt, otherwise y could be mistaken for у, and n - for п.

i18n-ru: fix "deleted files" in `status` description

tests: backport some glob fixups

help: fix role/option confusion in RST RST's role syntax means something different sometimes when it's in some places that are poorly documented and vary betwen minirst and docutils. Line wrapping will thus sometimes break everything.

merge with stable

summary: add a histedit hook

summary: indicate if a rebase is underway

summary: add tests for some extensions we plan to modify

mq: switch to new summary hook mechanism

summary: augment output with info from extensions

dirstate: don't overnormalize for ui.slash This should fix the issue exposed by debugpathcomplete on the buildbot.

merge with stable

bundle-ng: move progress handling out of the linkrev callback

bundle-ng: simplify lookup and state handling Use simpler callbacks to collect linkrev nodes.

bundle-ng: simplify bundle10.generate Remove complex local sub-functions mutating function-global variables. Simplify counting used for progress output.

shrink: delete extension preventing further refactoring (BC) Reordering can be done by setting bundle.reorder to true and doing a clone --pull.

bundle-ng: move bundle generation to changegroup.py

bundle-ng: unify _changegroup and _changegroupsubset Refactor the two changegroup generation interface to share as much code as possible.

bundle-ng: move gengroup into bundler, pass repo object to bundler No semantic changes made.

bundle-ng: add bundlecaps argument to getbundle() command

bundle-ng: move group into the bundler No additional semantic changes made.

bundle-ng: move bundler creation up in the stack Create a simple start() method to pass the lookup function until bundler becomes smarter and gets a repo object. Since we now create the bundler for the whole lifetime, we need to pass it down to revlog methods.

i18n: fix untranslated prompts with translated responses (issue3936)

help: stop documentation markup appearing in generated help Markup for links to mercurial commands is appearing in the help documentation. This patch fixes the markup so mercurial command reference links are correctly generated in the help documentation.

merge with stable

ui: use util.sizetoint in configbytes

util: migrate fileset._sizetoint to util.sizetoint The size counting code introduced in 2c4cd1c42365 duplicated existing (but unknown-to-me) code in fileset, so prepare to eliminate the duplication.

Added signature for changeset ddc7a6be2021

Added tag 2.6.1 for changeset ddc7a6be2021

dirstate.status: avoid full walks when possible

dirstate.walk: add a flag to let extensions avoid full walks Consider a hypothetical extension that implements walk in a more efficient manner and skips some known-clean files. However, that can only be done under some situations, such as when clean files are not being asked for and a match.traversedir callback is not set. The full flag lets walk tell these two cases apart.