annotate relnotes/5.2 @ 44396:acbfa31cfaf2

debugmergestate: make templated

Our IntelliJ team wants to be able to read the merge state in order to
help the user resolve merge conflicts. They had so far been reading
file contents from p1() and p2() and their merge base. That is not
ideal for several reasons (merge base is not necessarily the "graft
base", renames are not handled, commands like `hg update -m` is not
handled). It will get especially bad as of my D7827. This patch makes
the output s a templated. I haven't bothered to make it complete
(e.g. merge driver states are not handled), but it's probably good
enough as a start.

I've done a web search for "debugmergestate" and I can't find any
indication that any tools currently rely on its output. If it turns
out that we get bug reports for it once this is released, I won't
object to backing this patch out on the stable branch (and then
perhaps replace it by a separate command, or put it behind a new
flag).

The changes in test-backout.t are interesting, in particular this:

```
  -    other path: foo (node not stored in v1 format)
  +    other path:  (node foo)
```

I wonder if that means that we actually read v1 format
incorrectly. That seems to be an old format that was switched away
from in 2014, so it doesn't matter now anyway.

Differential Revision: https://phab.mercurial-scm.org/D8120

== New Features ==

 * The amend extension supports the `--currentuser` argument.

 * The amend extension supports the `--close-branch` argument.

 * The amend extension supports the `--secret` argument.

 * The uncommit extension supports the `rewrite.update-timestamp` config option.

== New Experimental Features ==


== Bug Fixes  ==


== Backwards Compatibility Changes ==

 * A shell that supports `$(command)`` syntax for command substitution is now
   required for running the test suite. The test runner normally uses
   `sh`, so if that is a shell that doesn't support `$(command)` syntax,
   you can override it by setting `$HGTEST_SHELL` or by passing it to
   `run-tests.py --shell <shell>`.

 * The (experimental) narrow extension's wire protocol changed. If
   you're using it, you'll need to make sure to upgrade server and
   client at the same time.

== Internal API Changes ==