Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
relnotes/next
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 20 Jan 2022 11:06:52 -0800
changeset 48587 3c8cc987672e
parent 48549 28f0092ec89f
child 48594 b128d21cbe8b
permissions -rw-r--r--
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
42271
0ed293a3f00e releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset 
     1
 
== New Features ==
48242
4d2ab365699e bookmarks: move the `mirror` option to the `paths` section
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48017
diff changeset 
     2
 







46254






c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches



Joerg Sonnenberger <joerg@bec.de>


parents: 
46237

diff
changeset




     3









46999






035c06f9fddf
relnode: document the move to `zstd` as default compression



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
46998

diff
changeset




     4


== Default Format Change ==












035c06f9fddf
relnode: document the move to `zstd` as default compression



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
46998

diff
changeset




     5














035c06f9fddf
relnode: document the move to `zstd` as default compression



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
46998

diff
changeset




     6


These changes affects newly created repositories (or new clone) done with







48302






1eaf37369eba
relnotes: clear next release notes



Raphaël Gomès <rgomes@octobus.net>


parents: 
48242

diff
changeset




     7


Mercurial XXX.







46999






035c06f9fddf
relnode: document the move to `zstd` as default compression



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
46998

diff
changeset




     8









47000






c3eee5ad1de9
relnote: document the use of persistent-nodemap by default for Rust build



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
46999

diff
changeset




     9









44367






9dab3fa64325
copy: add experimental support for marking committed copies



Martin von Zweigbergk <martinvonz@google.com>


parents: 
44365

diff
changeset




    10


== New Experimental Features ==







44343






8561ad49915d
revset: add a revset for parents in merge state



Martin von Zweigbergk <martinvonz@google.com>


parents: 
44289

diff
changeset




    11









45191






fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release



Manuel Jacob <me@manueljacob.de>


parents: 
45190

diff
changeset




    12


== Bug Fixes ==












fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release



Manuel Jacob <me@manueljacob.de>


parents: 
45190

diff
changeset




    13









48407






4d59e0f909e0
update: properly overwrite `check` config with `--no-` variants



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
48302

diff
changeset




    14


The `--no-check` and `--no-merge` now properly overwrite the behavior from `commands.update.check`.







45189






045f5361bd12
relnotes: make spacing before new section consistent



Manuel Jacob <me@manueljacob.de>


parents: 
45169

diff
changeset




    15









42271






0ed293a3f00e
releasenotes: add a file in which to record release notes



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    16


== Backwards Compatibility Changes ==












0ed293a3f00e
releasenotes: add a file in which to record release notes



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    17









48549






28f0092ec89f
exchange: add fast path for subrepo check on push



Joerg Sonnenberger <joerg@bec.de>


parents: 
48407

diff
changeset




    18


The remotefilelog extension now requires an appropiate excludepattern












28f0092ec89f
exchange: add fast path for subrepo check on push



Joerg Sonnenberger <joerg@bec.de>


parents: 
48407

diff
changeset




    19


for subrepositories.







44396






acbfa31cfaf2
debugmergestate: make templated



Martin von Zweigbergk <martinvonz@google.com>


parents: 
44392

diff
changeset




    20









48587






3c8cc987672e
simplemerge: take over formatting of label from `filemerge`



Martin von Zweigbergk <martinvonz@google.com>


parents: 
48549

diff
changeset




    21


The labels passed to merge tools have changed slightly. Merge tools can get












3c8cc987672e
simplemerge: take over formatting of label from `filemerge`



Martin von Zweigbergk <martinvonz@google.com>


parents: 
48549

diff
changeset




    22


labels passed to them if you include `$labellocal`, `$labelbase`, and/or












3c8cc987672e
simplemerge: take over formatting of label from `filemerge`



Martin von Zweigbergk <martinvonz@google.com>


parents: 
48549

diff
changeset




    23


`$labelother` in the `merge-tool.<tool name>.args` configuration. These labels












3c8cc987672e
simplemerge: take over formatting of label from `filemerge`



Martin von Zweigbergk <martinvonz@google.com>


parents: 
48549

diff
changeset




    24


used to have some space-padding, and truncation to fit within 72 columns. Both












3c8cc987672e
simplemerge: take over formatting of label from `filemerge`



Martin von Zweigbergk <martinvonz@google.com>


parents: 
48549

diff
changeset




    25


the padding and the truncation has been removed.












3c8cc987672e
simplemerge: take over formatting of label from `filemerge`



Martin von Zweigbergk <martinvonz@google.com>


parents: 
48549

diff
changeset




    26









42271






0ed293a3f00e
releasenotes: add a file in which to record release notes



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    27


== Internal API Changes ==












0ed293a3f00e
releasenotes: add a file in which to record release notes



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    28









47978






bad66df931b5
relnotes: update next



Raphaël Gomès <rgomes@octobus.net>


parents: 
47758

diff
changeset




    29


The following functions have been removed:







47758






ec77f709495c
relnotes: document the change in the dirstate API



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
47071

diff
changeset




    30









47978






bad66df931b5
relnotes: update next



Raphaël Gomès <rgomes@octobus.net>


parents: 
47758

diff
changeset




    31


Miscellaneous:














mercurial