[Request] [+ ] D9122: salvaged: explicitly skip salvaged file while encoding

[marmoute (Pierre-Yves David)]

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

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)



To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200930/0be0b20c/attachment.html>