admin-verify: pass p1 down to the dirstate function stable
authorRaphaël Gomès <rgomes@octobus.net>
Mon, 06 May 2024 12:31:29 +0200
branchstable
changeset 51489 dcb00d5c397a
parent 51488 c1b6b8b03e48
child 51490 2a27b921cd91
admin-verify: pass p1 down to the dirstate function This was forgotten and can break with certain kinds of corruption.
mercurial/admin/verify.py
--- a/mercurial/admin/verify.py	Mon May 06 11:27:29 2024 +0200
+++ b/mercurial/admin/verify.py	Mon May 06 12:31:29 2024 +0200
@@ -37,8 +37,7 @@
 
     is_narrow = requirements.NARROW_REQUIREMENT in repo.requirements
     narrow_matcher = repo.narrowmatch() if is_narrow else None
-
-    for err in repo.dirstate.verify(m1, m2, narrow_matcher):
+    for err in repo.dirstate.verify(m1, m2, parent1, narrow_matcher):
         ui.warn(err[0] % err[1:])
         errors += 1