branching: merge with stable

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

hgext/histedit.py

@@ -1760,8 +1760,6 b' 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

mercurial/revlogutils/nodemap.py

@@ -163,6 +163,8 b' 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"