censor: extract the part about writing the other revision in a function

The v2_censor function is huge, now that its content has settled a bit it is a
good time to split individual part inside dedicated function.

We continue with a small function that add a non-censored revision back to the
revlog.

Differential Revision: https://phab.mercurial-scm.org/D10899

mercurial/revlogutils/rewrite.py

@@ -270,8 +270,35 b' def v2_censor(rl, tr, censornode, tombst'
                 tombstone,
             )
 
-            #### Writing all subsequent revisions
+            # Writing all subsequent revisions
             for rev in range(censor_rev + 1, len(old_index)):
+                _rewrite_simple(
+                    rl,
+                    old_index,
+                    open_files,
+                    rev,
+                    rewritten_entries,
+                    tmp_storage,
+                )
+    docket.write(transaction=None, stripping=True)
+
+
+def _rewrite_simple(
+    revlog,
+    old_index,
+    all_files,
+    rev,
+    rewritten_entries,
+    tmp_storage,
+):
+    """append a normal revision to the index after the rewritten one(s)"""
+    (
+        old_data_file,
+        old_sidedata_file,
+        new_index_file,
+        new_data_file,
+        new_sidedata_file,
+    ) = all_files
                 entry = old_index[rev]
                 flags = entry[ENTRY_DATA_OFFSET] & 0xFFFF
                 old_data_offset = entry[ENTRY_DATA_OFFSET] >> 16
@@ -327,15 +354,13 b' def v2_censor(rl, tr, censornode, tombst'
                     data_compression_mode=d_comp_mode,
                     sidedata_compression_mode=sd_com_mode,
                 )
-                rl.index.append(new_entry)
-                entry_bin = rl.index.entry_binary(rev)
+    revlog.index.append(new_entry)
+    entry_bin = revlog.index.entry_binary(rev)
                 new_index_file.write(entry_bin)
 
-                docket.index_end = new_index_file.tell()
-                docket.data_end = new_data_file.tell()
-                docket.sidedata_end = new_sidedata_file.tell()
-
-    docket.write(transaction=None, stripping=True)
+    revlog._docket.index_end = new_index_file.tell()
+    revlog._docket.data_end = new_data_file.tell()
+    revlog._docket.sidedata_end = new_sidedata_file.tell()
 
 
 def _rewrite_censor(