| Alphare |
| hg-reviewers |
Now that the bulk of the code moved to smaller function we are less restricted
on line length and we can use more explicite naming.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| rl.opener.rename(newrl._indexfile, rl._indexfile) | rl.opener.rename(newrl._indexfile, rl._indexfile) | ||||
| if not rl._inline: | if not rl._inline: | ||||
| rl.opener.rename(newrl._datafile, rl._datafile) | rl.opener.rename(newrl._datafile, rl._datafile) | ||||
| rl.clearcaches() | rl.clearcaches() | ||||
| rl._loadindex() | rl._loadindex() | ||||
| def v2_censor(rl, tr, censornode, tombstone=b''): | def v2_censor(revlog, tr, censornode, tombstone=b''): | ||||
| """censors a revision in a "version 2" revlog""" | """censors a revision in a "version 2" revlog""" | ||||
| # General principle | # General principle | ||||
| # | # | ||||
| # We create new revlog files (index/data/sidedata) to copy the content of | # We create new revlog files (index/data/sidedata) to copy the content of | ||||
| # the existing data without the censored data. | # the existing data without the censored data. | ||||
| # | # | ||||
| # We need to recompute new delta for any revision that used the censored | # We need to recompute new delta for any revision that used the censored | ||||
| # revision as delta base. As the cumulative size of the new delta may be | # revision as delta base. As the cumulative size of the new delta may be | ||||
| # large, we store them in a temporary file until they are stored in their | # large, we store them in a temporary file until they are stored in their | ||||
| # final destination. | # final destination. | ||||
| # | # | ||||
| # All data before the censored data can be blindly copied. The rest needs | # All data before the censored data can be blindly copied. The rest needs | ||||
| # to be copied as we go and the associated index entry needs adjustement. | # to be copied as we go and the associated index entry needs adjustement. | ||||
| assert rl._format_version != REVLOGV0, rl._format_version | assert revlog._format_version != REVLOGV0, revlog._format_version | ||||
| assert rl._format_version != REVLOGV1, rl._format_version | assert revlog._format_version != REVLOGV1, revlog._format_version | ||||
| old_index = rl.index | old_index = revlog.index | ||||
| docket = rl._docket | docket = revlog._docket | ||||
| censor_rev = rl.rev(censornode) | censor_rev = revlog.rev(censornode) | ||||
| tombstone = storageutil.packmeta({b'censored': tombstone}, b'') | tombstone = storageutil.packmeta({b'censored': tombstone}, b'') | ||||
| censored_entry = rl.index[censor_rev] | censored_entry = revlog.index[censor_rev] | ||||
| index_cutoff = rl.index.entry_size * censor_rev | index_cutoff = revlog.index.entry_size * censor_rev | ||||
| data_cutoff = censored_entry[ENTRY_DATA_OFFSET] >> 16 | data_cutoff = censored_entry[ENTRY_DATA_OFFSET] >> 16 | ||||
| sidedata_cutoff = rl.sidedata_cut_off(censor_rev) | sidedata_cutoff = revlog.sidedata_cut_off(censor_rev) | ||||
| with pycompat.unnamedtempfile(mode=b"w+b") as tmp_storage: | with pycompat.unnamedtempfile(mode=b"w+b") as tmp_storage: | ||||
| # rev → (new_base, data_start, data_end, compression_mode) | # rev → (new_base, data_start, data_end, compression_mode) | ||||
| rewritten_entries = _precompute_rewritten_delta( | rewritten_entries = _precompute_rewritten_delta( | ||||
| rl, | revlog, | ||||
| old_index, | old_index, | ||||
| {censor_rev}, | {censor_rev}, | ||||
| tmp_storage, | tmp_storage, | ||||
| ) | ) | ||||
| all_files = _setup_new_files( | all_files = _setup_new_files( | ||||
| rl, | revlog, | ||||
| index_cutoff, | index_cutoff, | ||||
| data_cutoff, | data_cutoff, | ||||
| sidedata_cutoff, | sidedata_cutoff, | ||||
| ) | ) | ||||
| # we dont need to open the old index file since its content already | # we dont need to open the old index file since its content already | ||||
| # exist in a usable form in `old_index`. | # exist in a usable form in `old_index`. | ||||
| with all_files() as open_files: | with all_files() as open_files: | ||||
| ( | ( | ||||
| old_data_file, | old_data_file, | ||||
| old_sidedata_file, | old_sidedata_file, | ||||
| new_index_file, | new_index_file, | ||||
| new_data_file, | new_data_file, | ||||
| new_sidedata_file, | new_sidedata_file, | ||||
| ) = open_files | ) = open_files | ||||
| # writing the censored revision | # writing the censored revision | ||||
| _rewrite_censor( | _rewrite_censor( | ||||
| rl, | revlog, | ||||
| old_index, | old_index, | ||||
| open_files, | open_files, | ||||
| censor_rev, | censor_rev, | ||||
| tombstone, | tombstone, | ||||
| ) | ) | ||||
| # Writing all subsequent revisions | # Writing all subsequent revisions | ||||
| for rev in range(censor_rev + 1, len(old_index)): | for rev in range(censor_rev + 1, len(old_index)): | ||||
| _rewrite_simple( | _rewrite_simple( | ||||
| rl, | revlog, | ||||
| old_index, | old_index, | ||||
| open_files, | open_files, | ||||
| rev, | rev, | ||||
| rewritten_entries, | rewritten_entries, | ||||
| tmp_storage, | tmp_storage, | ||||
| ) | ) | ||||
| docket.write(transaction=None, stripping=True) | docket.write(transaction=None, stripping=True) | ||||