diff -r 376395868b7b -r c166b212bdee hgext/keyword.py --- a/hgext/keyword.py Tue Dec 13 10:00:04 2022 +0100 +++ b/hgext/keyword.py Wed Jan 25 18:46:20 2023 +0100 @@ -696,7 +696,7 @@ kwt = getattr(repo, '_keywordkwt', None) if kwt is None: return orig(ui, repo, old, extra, pats, opts) - with repo.wlock(), repo.dirstate.parentchange(): + with repo.wlock(), repo.dirstate.parentchange(repo): kwt.postcommit = True newid = orig(ui, repo, old, extra, pats, opts) if newid != old.node(): @@ -762,7 +762,7 @@ if ctx != recctx: modified, added = _preselect(wstatus, recctx.files()) kwt.restrict = False - with repo.dirstate.parentchange(): + with repo.dirstate.parentchange(repo): kwt.overwrite(recctx, modified, False, True) kwt.overwrite(recctx, added, False, True, True) kwt.restrict = True