Mercurial > hg-stable

changeset 47717:d905eff405d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: replace usage of `normal` with newer API Differential Revision: https://phab.mercurial-scm.org/D11159
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 18 Jul 2021 22:49:26 +0200
parents 2d0717b135c9
children 03ef0c8fa7d5
files hgext/mq.py
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/mq.py	Mon Jul 19 02:46:09 2021 +0200
+++ b/hgext/mq.py	Sun Jul 18 22:49:26 2021 +0200
@@ -1855,7 +1855,9 @@
                     for f in m + r:
                         fctx = ctx[f]
                         repo.wwrite(f, fctx.data(), fctx.flags())
-                        repo.dirstate.normal(f)
+                        repo.dirstate.update_file(
+                            f, p1_tracked=True, wc_tracked=True
+                        )
                     repo.setparents(qp, repo.nullid)
             for patch in reversed(self.applied[start:end]):
                 self.ui.status(_(b"popping %s\n") % patch.name)
@@ -2047,7 +2049,7 @@
                             mm.append(m[i])
                             del m[i]
                     for f in m:
-                        repo.dirstate.normal(f)
+                        repo.dirstate.update_file_p1(f, p1_tracked=True)
                     for f in mm:
                         repo.dirstate.normallookup(f)
                     for f in forget: