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

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

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
Martin von Zweigbergk - - Load All Authors

File last commit:

r44595:1f8f2152 stable
r49433:3c8cc987 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).