This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7891

nodemap: write new data from the expected current data length
ClosedPublic

Authored by marmoute on Jan 15 2020, 9:56 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2ea6a67ff502: nodemap: write new data from the expected current data length
Summary

If the amount of data in the file exceed the expect amount, we will overwrite
the extra data. This is a simple way to be safer.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jan 15 2020, 9:56 AM
marmoute updated this revision to Diff 19772.Jan 31 2020, 10:30 AM
marmoute updated this revision to Diff 19799.Jan 31 2020, 6:00 PM
marmoute updated this revision to Diff 19843.Feb 2 2020, 3:19 AM

small doc update on .#s[1]

marmoute updated this revision to Diff 19903.Feb 4 2020, 7:25 PM

rebase to latest default

marmoute added a commit: rHG2ea6a67ff502: nodemap: write new data from the expected current data length.Feb 10 2020, 8:28 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG2ea6a67ff502: nodemap: write new data from the expected current data length (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlogutils/nodemap.py (3 lines)

Diff 20124

mercurial/revlogutils/nodemap.py

data, data,
) = revlog.index.nodemap_data_incremental() ) = revlog.index.nodemap_data_incremental()
if src_docket != target_docket: if src_docket != target_docket:
data = None data = None
else: else:
datafile = _rawdata_filepath(revlog, target_docket) datafile = _rawdata_filepath(revlog, target_docket)
# EXP-TODO: if this is a cache, this should use a cache vfs, not a # EXP-TODO: if this is a cache, this should use a cache vfs, not a
# store vfs # store vfs
with revlog.opener(datafile, b'a') as fd: with revlog.opener(datafile, b'r+') as fd:
fd.seek(target_docket.data_length)
fd.write(data) fd.write(data)
target_docket.data_length += len(data) target_docket.data_length += len(data)
target_docket.data_unused += data_changed_count target_docket.data_unused += data_changed_count
if data is None: if data is None:
# otherwise fallback to a full new export # otherwise fallback to a full new export
target_docket = NodeMapDocket() target_docket = NodeMapDocket()
datafile = _rawdata_filepath(revlog, target_docket) datafile = _rawdata_filepath(revlog, target_docket)