This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9122

salvaged: explicitly skip salvaged file while encoding
ClosedPublic

Authored by marmoute on Sep 30 2020, 9:10 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe66db30f95a8: salvaged: explicitly skip salvaged file while encoding
rHG3bfa7c7ffb6e: salvaged: explicitly skip salvaged file while encoding
rHG9835dde69c16: salvaged: explicitly skip salvaged file while encoding
Summary

This is a temporary measure to avoid diverging test cases (between commit time
sidedata and upgraded sidedata) while we implement salvaged tracking in the
different cases. This will be dropped soon.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/metadata.py (2 lines)

Diff 23084

mercurial/metadata.py

COPIED_FROM_P2_FLAG = int("11", 2) COPIED_FROM_P2_FLAG = int("11", 2)
# structure is <flag><filename-end><copy-source> # structure is <flag><filename-end><copy-source>
INDEX_HEADER = struct.Struct(">L") INDEX_HEADER = struct.Struct(">L")
INDEX_ENTRY = struct.Struct(">bLL") INDEX_ENTRY = struct.Struct(">bLL")
def encode_files_sidedata(files): def encode_files_sidedata(files):
all_files = set(files.touched) all_files = set(files.touched - files.salvaged)
all_files.update(files.copied_from_p1.values()) all_files.update(files.copied_from_p1.values())
all_files.update(files.copied_from_p2.values()) all_files.update(files.copied_from_p2.values())
all_files = sorted(all_files) all_files = sorted(all_files)
file_idx = {f: i for (i, f) in enumerate(all_files)} file_idx = {f: i for (i, f) in enumerate(all_files)}
file_idx[None] = 0 file_idx[None] = 0
chunks = [INDEX_HEADER.pack(len(all_files))] chunks = [INDEX_HEADER.pack(len(all_files))]