Mercurial > hg-stable
changeset 51204:028498b04a84
branching: merge with stable
This recreates `37b52b938579` right as a `hg branch --rev 5b186ba40001` screwed
up the content.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 15 Dec 2023 11:08:41 +0100 |
| parents | 933551630b0d (current diff) 1486d8c63f64 (diff) |
| children | a9f96e809c2a |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Thu Dec 07 09:31:07 2023 -0800 +++ b/hgext/histedit.py Fri Dec 15 11:08:41 2023 +0100 @@ -1760,8 +1760,6 @@ rules.append(histeditrule(ui, repo[r], i)) with util.with_lc_ctype(): rc = curses.wrapper(functools.partial(_chisteditmain, repo, rules)) - curses.echo() - curses.endwin() if rc is False: ui.write(_(b"histedit aborted\n")) return 0
--- a/mercurial/revlogutils/nodemap.py Thu Dec 07 09:31:07 2023 -0800 +++ b/mercurial/revlogutils/nodemap.py Fri Dec 15 11:08:41 2023 +0100 @@ -163,6 +163,8 @@ def persist_nodemap(tr, revlog, pending=False, force=False): """Write nodemap data on disk for a given revlog""" + if len(revlog.index) <= 0: + return if getattr(revlog, 'filteredrevs', ()): raise error.ProgrammingError( "cannot persist nodemap of a filtered changelog"