# HG changeset patch
# User Raphaël Gomès <rgomes@octobus.net>
# Date 1671620582 -3600
# Node ID fdd227585d5a99f5d712803abf59835d212037e6
# Parent  2715c8549f4b476a193752b112970b02949525b4
verify: format messages directly at the source

diff -r 2715c8549f4b -r fdd227585d5a mercurial/debugcommands.py
--- a/mercurial/debugcommands.py	Mon May 02 11:58:43 2022 +0200
+++ b/mercurial/debugcommands.py	Wed Dec 21 12:03:02 2022 +0100
@@ -559,7 +559,7 @@
     m2 = repo[parent2].manifest()
     errors = 0
     for err in repo.dirstate.verify(m1, m2):
-        ui.warn(err[0] % err[1:])
+        ui.warn(err)
         errors += 1
     if errors:
         errstr = _(b".hg/dirstate inconsistent with current parent's manifest")
diff -r 2715c8549f4b -r fdd227585d5a mercurial/dirstate.py
--- a/mercurial/dirstate.py	Mon May 02 11:58:43 2022 +0200
+++ b/mercurial/dirstate.py	Wed Dec 21 12:03:02 2022 +0100
@@ -1557,14 +1557,14 @@
         for f, entry in self.items():
             if entry.p1_tracked:
                 if entry.modified and f not in m1 and f not in m2:
-                    yield (missing_from_ps, f)
+                    yield missing_from_ps % f
                 elif f not in m1:
-                    yield (missing_from_p1, f)
+                    yield missing_from_p1 % f
             if entry.added and f in m1:
-                yield (unexpected_in_p1, f)
+                yield unexpected_in_p1 % f
         for f in m1:
             if narrow_matcher is not None and not narrow_matcher(f):
                 continue
             entry = self.get_entry(f)
             if not entry.p1_tracked:
-                yield (missing_from_ds, f)
+                yield missing_from_ds % f