Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: wrap dirstate mutation in `changing_files` context
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 22 Feb 2023 03:34:48 +0100
changeset 50150 b09a0afcb975
parent 50149 03decaaf1eff
child 50151 092db6464321
keyword: wrap dirstate mutation in `changing_files` context This is the way.
hgext/keyword.py file | annotate | diff | comparison | revisions 
--- a/hgext/keyword.py	Tue Feb 21 23:10:02 2023 +0100
+++ b/hgext/keyword.py	Wed Feb 22 03:34:48 2023 +0100
@@ -437,12 +437,11 @@
     if len(wctx.parents()) > 1:
         raise error.Abort(_(b'outstanding uncommitted merge'))
     kwt = getattr(repo, '_keywordkwt', None)
-    with repo.wlock():
+    with repo.wlock(), repo.dirstate.changing_files(repo):
         status = _status(ui, repo, wctx, kwt, *pats, **opts)
         if status.modified or status.added or status.removed or status.deleted:
             raise error.Abort(_(b'outstanding uncommitted changes'))
         kwt.overwrite(wctx, status.clean, True, expand)
-        repo.dirstate.write(repo.currenttransaction())
 
 
 @command(
Mercurial