Patchwork D9122: salvaged: explicitly skip salvaged file while encoding

login
register
mail settings
Submitter phabricator
Date Sept. 30, 2020, 1:10 p.m.
Message ID <differential-rev-PHID-DREV-sadwppsuyzqnklw6kgpu-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47339/
State Superseded
Headers show

Comments

phabricator - Sept. 30, 2020, 1:10 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION 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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9122

AFFECTED FILES
  mercurial/metadata.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/metadata.py b/mercurial/metadata.py
--- a/mercurial/metadata.py
+++ b/mercurial/metadata.py
@@ -423,10 +423,11 @@ 
     added = files.added
     removed = files.removed
     merged = files.merged
+    salvaged = files.salvaged
     copied_from_p1 = files.copied_from_p1
     copied_from_p2 = files.copied_from_p2
 
-    all_files = set(touched)
+    all_files = set(touched - salvaged)
     all_files.update(copied_from_p1.values())
     all_files.update(copied_from_p2.values())
     all_files = sorted(all_files)