merge latest tag in 3.5 branch

merge latest tag in 3.6-branch

merge latest tag in 3.7-branch

merge back with stable

Added tag 5.4.0 for changeset b21ce82e6f76

evolve: prepare release of version 5.4.0

evolve: update testedwith field 3.8.1 is working fine and no older branch had to be dropped.

merge with stable through 3.5 branch

test: wider glob for payload size For some reason this various a bit more than previously though.

merge with stable throug 3.6 branch

merge with stable through 3.7 branch dropped the topic test and updated output with some minor difference Hg: Enter commit message. Lines beginning with 'HG:' are removed.

mercurial-3.7: revert output change No feature regression but various output change

merge default into stable Mercurial 3.8 have been release, let's get ready for a 5.4.0 release.

test: rename TOPICROOT to HGTEST_TOPICROOT Mercurial is about to introduce whitelisting of environment variable, we comply to the planned prefix in advance in a hope to stay compatible in the future.

test: update topic test output for order change As in topic d8f1e432b16a the tipmost changeset is now displayed first. We adapt the test output to reflect it.

test: update topic test output for indexing change Changeset 61f36480740f in topic updated the indexing scheme, we update the test to take this into account.

test: adapt topic test The 'created new head' bug was fixed in bdc5bb223b50, we adapt the test with the fixed output.

test: improve skipped message for topic The skipped message should point people to a way to solve the situation.

prune: suggest --biject in error "hint" When use specify multiple changesets to prune and as successors, we should point them to the right options to confirm there intend.

metaedit: check for public changeset before instability Public changeset will stay public even if the selection is adjusted, this is a more definitive condition that is worth warning about first.

fold: move sanity check after locking Checking for operation validaty without the locks open us to race condition.

metaedit: add support for folding commits while editing their metadata This also allows us to accept multiple commits without dealing with the thorny algorithmic and UI issues of editing multiple commits at once. Crucially, it is different from 'hg fold --exact' in that it also allows 'folding' a single commit and rewriting its metadata. This is really useful to have as a single logical operation, for example while preparing a series of multiple local changesets that will need to be pushed as a single changeset.

commands: introduce a new command to edit commit metadata This patch introduces metaedit, a command to metadata of a set of revisions without updating the working copy. This is particularly relevant for repositories where changing the parent of the working copy is time-consuming. We could add more stack manipulation operations to metaedit in the future.

evolve: factor out check for creating unstable commits This check is pretty non-trivial, and we do it in two places already. We're going to do it in a third place soon.

evolve: factor out sanity checks for folds We're going to use the same checks in another context in an upcoming patch.

evolve: include node, rev, desc, and phase in list

evolve: use hex in list output

py3: use items() instead of iteritems()

py3: change except from two comma to as notation

py3: tolerate io/StringIO divergence

split: rewrite the pre-split commit message I find this wording slightly clearer.

open mercurial-3.7 compat branch

readme: add various missing parts

hgignore: add an ignore rule for test timing Modern tests runner store a record of last test run timing. We properly ignore it.

tests: change quoting pattern to match core's conventions This patch modifies two tests to match new quoting patterns used in core: (use "hg config --edit" to set your username) becomes (use 'hg config --edit' to set your username) and (use hg resolve and hg graft --continue) becomes (use 'hg resolve' and 'hg graft --continue')

Spelling: committed

Spelling (en-us): behavior

Spelling: forbidden

Brand: Mercurial

Grammar: paragraphs should end with periods

Grammar: the

Grammar: resulting issues

Grammar: introduced

Grammar: has

Spelling: versioning

Spelling: unnecessary

Spelling: through

Spelling: those

Spelling: succeeded

Spelling: remotely

Spelling: remains

Spelling: precursors

Spelling: practice

Spelling: directory

Spelling: happened

Spelling: formerly