view relnotes/5.3 @ 45382:0652a533fe3c

mergestate: use _stateextras instead of merge records for commit related info

There is a set of information related to a merge which is needed on commit. We
want to store such information in the mergestate so that we can read it while
committing.

For this purpose, we are using merge records and introduced a merge
entry state for that. However this won't scale and is not clean way to implement
this.

This patch reworks the existing logic related to this to use _stateextras and
read from it.

Right now the information stored is not very descriptive but it will be in next
patch.

Using _stateextras also makes MERGE_RECORD_MERGED_OTHER useless and only to be
kept for BC.

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

== New Features ==

 * Windows will process hgrc files in %PROGRAMDATA%\Mercurial\hgrc.d.


== New Experimental Features ==


== Bug Fixes  ==

 * The `indent()` template function was documented to not indent empty lines,
   but it still indented the first line even if it was empty. It no longer does
   that.

== Backwards Compatibility Changes ==


== Internal API Changes ==

 * Matcher instances no longer have a `explicitdir` property. Consider
   rewriting your code to use `repo.wvfs.isdir()` and/or
   `ctx.hasdir()` instead. Also, the `traversedir` property is now
   also called when only `explicitdir` used to be called. That may
   mean that you can simply remove the use of `explicitdir` if you
   were already using `traversedir`.

 * The `revlog.nodemap` object have been merged into the `revlog.index` object.
   * `n in revlog.nodemap` becomes `revlog.index.has_node(n)`,
   * `revlog.nodemap[n]` becomes `revlog.index.rev(n)`,
   * `revlog.nodemap.get(n)` becomes `revlog.index.get_rev(n)`.

 * `copies.duplicatecopies()` was renamed to
   `copies.graftcopies()`. Its arguments changed from revision numbers
   to context objects. It also lost its `repo` and `skip` arguments
   (they should no longer be needed).