##// END OF EJS Templates
simplemerge: take over formatting of label from `filemerge`...
simplemerge: take over formatting of label from `filemerge` The padding we do of conflict labels depends on which conflict marker style is used. For two-way conflict markers (the default), the length of the base label shouldn't matter. It does before this patch, however. This patch moves the formatting from `filemerge` to `simplemerge`. The latter knows which conflict marker style to use, so it can easily decide about the padding. This change will allow us to use more descriptive "base" labels without causing illogical padding in 2-way markers. I'll do that next. One wrinkle is that we pass the same labels to external merge tools. I decided to change that in this patch to be simpler: no padding, and no ellipsis to fit within 80 columns. My reasoning is that the typical external, 3-or-4-panel merge tool doesn't show the labels on top of each others, so the padding doesn't make sense there. The ellipsis is probably not necessary because the external tools probably have their own way of dealing with long labels. Also, we limit them to "80 - 8" to fit the "<<<<<<< " before, which is almost definitely not what an external tool would put there. Differential Revision: https://phab.mercurial-scm.org/D12019

File last commit:

r47778:32b52741 stable
r49433:3c8cc987 default
Show More
5.8
68 lines | 2.7 KiB | application/x-troff | GroffLexer
== New Features ==
* `hg purge` is now a core command using `--confirm` by default.
* The `rev-branch-cache` is now updated incrementally whenever changesets
are added.
* The new options `experimental.bundlecompthreads` and
`experimental.bundlecompthreads.<engine>` can be used to instruct
the compression engines for bundle operations to use multiple threads
for compression. The default is single threaded operation. Currently
only supported for zstd.
== Default Format Change ==
These changes affects newly created repositories (or new clone) done with
Mercurial 5.8.
* The `ZSTD` compression will now be used by default for new repositories
when available. This compression format was introduced in Mercurial 5.0,
released in May 2019. See `hg help config.format.revlog-compression` for
details.
* Mercurial installation built with the Rust parts will now use the
"persistent nodemap" feature by default. This feature was introduced in
Mercurial 5.4 (May 2020). However Mercurial instalation built without the
fast Rust implementation will refuse to interract with them by default.
This restriction can be lifted through configuration.
See `hg help config.format.use-persistent-nodemap` for details
== New Experimental Features ==
* There's a new `diff.merge` config option to show the changes
relative to an automerge for merge changesets. This makes it
easier to detect and review manual changes performed in merge
changesets. It is supported by `hg diff --change`, `hg log -p`
`hg incoming -p`, and `hg outgoing -p` so far.
== Bug Fixes ==
* gracefully recover from inconsistent persistent-nodemap data from disk.
== Backwards Compatibility Changes ==
* In normal repositories, the first parent of a changeset is not null,
unless both parents are null (like the first changeset). Some legacy
repositories violate this condition. The revlog code will now
silentely swap the parents if this condition is tested. This can
change the output of `hg log` when explicitly asking for first or
second parent. The changesets "nodeid" are not affected.
== Internal API Changes ==
* `changelog.branchinfo` is deprecated and will be removed after 5.8.
It is superseded by `changelogrevision.branchinfo`.
* Callbacks for revlog.addgroup and the changelog._nodeduplicatecallback hook
now get a revision number as argument instead of a node.
* revlog.addrevision returns the revision number instead of the node.
* `nodes.nullid` and related constants are being phased out as part of
the deprecation of SHA1. Repository instances and related classes
provide access via `nodeconstants` and in some cases `nullid` attributes.