Mercurial > hg-stable

changeset 50190:42288fa03322

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
large-files: use `running_status` in `mergeupdate`
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 22 Feb 2023 00:23:06 +0100
parents f757788a6c25
children 308aff0243ae
files hgext/largefiles/overrides.py
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Wed Feb 22 00:22:44 2023 +0100
+++ b/hgext/largefiles/overrides.py	Wed Feb 22 00:23:06 2023 +0100
@@ -1786,15 +1786,15 @@
         #
         # (*) don't care
         # (*1) deprecated, but used internally (e.g: "rebase --collapse")
-
-        lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
-        unsure, s, mtime_boundary = lfdirstate.status(
-            matchmod.always(),
-            subrepos=[],
-            ignored=False,
-            clean=True,
-            unknown=False,
-        )
+        with repo.dirstate.running_status(repo):
+            lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
+            unsure, s, mtime_boundary = lfdirstate.status(
+                matchmod.always(),
+                subrepos=[],
+                ignored=False,
+                clean=True,
+                unknown=False,
+            )
         oldclean = set(s.clean)
         pctx = repo[b'.']
         dctx = repo[node]