discovery: avoid wrong detection of multiple branch heads (issue6256) This fix the code using obsolescence markers to remove "to be obsoleted" heads during the detection of new head creation from push. The code turned out to not use the branch information at all. This lead changeset from different branch to be detected as new head on unrelated branch. The code fix is actually quite simple. New tests have been added to covers these cases. Differential Revision: https://phab.mercurial-scm.org/D8259

tests: avoid implicit conversion of str to unicode On Python 2, str.encode('utf-8') implicitly converts the string to unicode and then back to str. Using _sys2bytes() ensures that opt is only encoded on Python 3, where opt is unicode. Although contrived, before this change, a UnicodeDecodeError could be triggered on Python 2 when passing non-ascii values to --extra-config-opt.

tests: rename _bytespath() to _sys2bytes() and _strpath() to _sys2str() The names were not general enough because e.g. _strpath() was used for converting IP addresses.

tests: avoid implicit conversion of str to unicode On Python 2, str.encode('ascii') implicitly converts the string to unicode and then back to str. Since the converted value is a path, _bytespath can be used instead.

tests: avoid implicit conversion of str to unicode On Python 2, str.encode('ascii') implicitly converts the string to unicode and then back to str. Since the point of this expression is to convert a bool to a str, the '%r' conversion specifier can be used instead in the format string.

nodemap: warm the persistent nodemap on disk with debugupdatecache When appropriate, the nodemap cache file will be created. Differential Revision: https://phab.mercurial-scm.org/D8173

copies-tests: update to null after setup for output stability This avoid having '@' moving around in graph output when the graph evolves. after this change, graph evolution is still noisy, but less. Differential Revision: https://phab.mercurial-scm.org/D8236

copies-tests: remove extra log call at the end of the chain-merge test file We do not actually need theses as the graph is displayed earlier anyway. I think they are the remain of me trying to understand that case better. Differential Revision: https://phab.mercurial-scm.org/D8235

commit: print debug message when clearing dirstate and wdir clean This case is a little weird, so let's have a debug message. Differential Revision: https://phab.mercurial-scm.org/D8231

merge with stable