upstream/mercurial-mirror Files · relnotes/next

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:

r49433:3c8cc987 default


                r49433:3c8cc987

default

Download file

             next
        
                    31 lines
            
             | 867 B
            
                | text/plain
            
             |
                TextLexer

/ relnotes / next

History | Source | Raw |Copy content |Copy permalink

Martin von Zweigbergk releasenotes: add a file in which to record release notes...	r42457	== New Features ==
marmoute bookmarks: move the `mirror` option to the `paths` section...	r49056
Joerg Sonnenberger branchmap: avoid ancestor computations in absence of non-continous branches...	r46880
marmoute relnode: document the move to `zstd` as default compression...	r47762	== Default Format Change ==

		These changes affects newly created repositories (or new clone) done with
Raphaël Gomès relnotes: clear next release notes...	r49123	Mercurial XXX.
marmoute relnode: document the move to `zstd` as default compression...	r47762
marmoute relnote: document the use of persistent-nodemap by default for Rust build...	r47763
Martin von Zweigbergk copy: add experimental support for marking committed copies...	r44847	== New Experimental Features ==
Martin von Zweigbergk revset: add a revset for parents in merge state...	r44817
Manuel Jacob relnotes: add release notes for relevant changes I did since the 5.4 release...	r45764	== Bug Fixes ==

marmoute update: properly overwrite `check` config with `--no-` variants...	r49236	The `--no-check` and `--no-merge` now properly overwrite the behavior from `commands.update.check`.
Manuel Jacob relnotes: make spacing before new section consistent...	r45762
Martin von Zweigbergk releasenotes: add a file in which to record release notes...	r42457	== Backwards Compatibility Changes ==

Joerg Sonnenberger exchange: add fast path for subrepo check on push...	r49381	The remotefilelog extension now requires an appropiate excludepattern
		for subrepositories.
Martin von Zweigbergk debugmergestate: make templated...	r44880
Martin von Zweigbergk simplemerge: take over formatting of label from `filemerge`...	r49433	The labels passed to merge tools have changed slightly. Merge tools can get
		labels passed to them if you include `$labellocal`, `$labelbase`, and/or
		`$labelother` in the `merge-tool.<tool name>.args` configuration. These labels
		used to have some space-padding, and truncation to fit within 72 columns. Both
		the padding and the truncation has been removed.

Martin von Zweigbergk releasenotes: add a file in which to record release notes...	r42457	== Internal API Changes ==

Raphaël Gomès relnotes: update next...	r48792	The following functions have been removed:
marmoute relnotes: document the change in the dirstate API...	r48558
Raphaël Gomès relnotes: update next...	r48792	Miscellaneous:

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages