Mercurial > hg
view relnotes/5.3 @ 44824:f189c5280d48 stable
py3: fix exception in pull when several things happen to a bookmark
Specifically, when `changes` is:
[(b'@upstream-committed', None, <function ui.status>, b'updating bookmark @upstream-committed\n'),
(b'@upstream-committed', binary-node, <function ui.warn>, b'divergent bookmark @ stored as @upstream-committed\n')]
sorting the list raises:
TypeError: '<' not supported between instances of 'bytes' and 'NoneType'
Differential Revision: https://phab.mercurial-scm.org/D8523
author | Valentin Gatien-Baron <vgatien-baron@janestreet.com> |
---|---|
date | Thu, 14 May 2020 10:24:52 -0400 |
parents | 1f8f215219ff |
children |
line wrap: on
line source
== 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).