##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)...
mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API) Storing that a file is resolved for the other parent while merging is just one case of things we will like to store in the mergestate. There are more which we will like to store. This patch replaces `addmergedother()` with a much more generic `addcommitinfo()`. Doing this, we also blinding stores the same key value pair generated by the merge code instead of touching them. Differential Revision: https://phab.mercurial-scm.org/D8923
Martin von Zweigbergk - - Load All Authors

File last commit:

r44595:1f8f2152 stable
r45945:05d19ca3 default
Show More
5.3
35 lines | 1.2 KiB | application/x-troff | GroffLexer
/ relnotes / 5.3
History | Annotation | Raw |Copy content |Copy permalink
== 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).