# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 2023-12-15 10:08:41
# Node ID 028498b04a84873832e0b4a755c2544cf04257b5
# Parent  933551630b0d7027e0ce67cbbad13e8afcae1395
# Parent  1486d8c63f641ba28a2937b61b3feed04d6a50c4

branching: merge with stable

This recreates `37b52b938579` right as a `hg branch --rev 5b186ba40001` screwed
up the content.

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -1760,8 +1760,6 @@ def _chistedit(ui, repo, freeargs, opts)
             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
diff --git a/mercurial/revlogutils/nodemap.py b/mercurial/revlogutils/nodemap.py
--- a/mercurial/revlogutils/nodemap.py
+++ b/mercurial/revlogutils/nodemap.py
@@ -163,6 +163,8 @@ def delete_nodemap(tr, repo, revlog):
 
 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"