continue: ensure we hold the wlock before writing file to disk A hack in 'hg evolve --continue' involve writing a 'graftstate' file. We take the wlock before doing so.

test: also use 'devel.legacy.exchange=bundle1' in test Changeset 39537bc64442 in mercurial removed the 'experimental.bundle2' option. We use the new option in parallel.

dirstate: use arg count for version check In 52ff07e1de91 in the main hg repo, dirstate was changed to require a second argument, making the default args check no longer work. Instead, we switch to check the number of arguments, which should be backwards and forwards compatible.

merge back with stable

Added tag 5.4.1 for changeset 2ad40d972a74

prepare release 5.4.1

3.9 have been released

open mercurial-3.7 compat branch

directaccess: make sure gethashsymbols does not return rev numbers With "hg log -r 1 -r 2 -r 3", gethashsymbols will get the following tree: ('func', ('symbol', '_list'), ('string', '1\x002\x003')) Before this patch, it will return ['1', '2', '3'], which are revision numbers and causes unnecessary (expensive) partialmatch lookups. This patch refacts gethashsymbols a bit, making sure the returning values are always filtered.

evolve: use hashlib to compute sha1 hashes The util alias for sha1 was dropped in c27dc3c3122 in favor of hashlib.

merge with stable

inhibit: protect agains dropped 'bmstore.write' As planned per the deprecation policy, 'bmstore.write' have been dropped in Mercurial core (052c9318e464).

help: fix evolution help grammar

help: fix evolution hg phases reference

merge latest tag in 3.4 branch

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.