Mercurial > hg
comparison mercurial/metadata.py @ 45660:e66db30f95a8
salvaged: explicitly skip salvaged file while encoding
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.
Differential Revision: https://phab.mercurial-scm.org/D9122
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 30 Sep 2020 12:46:49 +0200 |
| parents | a475db79d84d |
| children | cf474af69766 |
comparison
equal
deleted
inserted
replaced
| 45659:a475db79d84d | 45660:e66db30f95a8 |
|---|---|
| 416 INDEX_HEADER = struct.Struct(">L") | 416 INDEX_HEADER = struct.Struct(">L") |
| 417 INDEX_ENTRY = struct.Struct(">bLL") | 417 INDEX_ENTRY = struct.Struct(">bLL") |
| 418 | 418 |
| 419 | 419 |
| 420 def encode_files_sidedata(files): | 420 def encode_files_sidedata(files): |
| 421 all_files = set(files.touched) | 421 all_files = set(files.touched - files.salvaged) |
| 422 all_files.update(files.copied_from_p1.values()) | 422 all_files.update(files.copied_from_p1.values()) |
| 423 all_files.update(files.copied_from_p2.values()) | 423 all_files.update(files.copied_from_p2.values()) |
| 424 all_files = sorted(all_files) | 424 all_files = sorted(all_files) |
| 425 file_idx = {f: i for (i, f) in enumerate(all_files)} | 425 file_idx = {f: i for (i, f) in enumerate(all_files)} |
| 426 file_idx[None] = 0 | 426 file_idx[None] = 0 |