# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1676502861 -3600
# Node ID d91fc026071c11d3a253c6e49b8211f1e6c95d3e
# Parent  c8f32aa80dcab19027d35bbef1133faec6e6620c
rollback: remove the dirstateguard usage

Thanks to the previous changeset, we no longer needs it.

begone !

diff -r c8f32aa80dca -r d91fc026071c mercurial/localrepo.py
--- a/mercurial/localrepo.py	Thu Feb 16 10:00:59 2023 +0100
+++ b/mercurial/localrepo.py	Thu Feb 16 00:14:21 2023 +0100
@@ -42,7 +42,6 @@
     commit,
     context,
     dirstate,
-    dirstateguard,
     discovery,
     encoding,
     error,
@@ -2695,22 +2694,20 @@
                 return False
 
     def rollback(self, dryrun=False, force=False):
-        wlock = lock = dsguard = None
+        wlock = lock = None
         try:
             wlock = self.wlock()
             lock = self.lock()
             if self.svfs.exists(b"undo"):
-                dsguard = dirstateguard.dirstateguard(self, b'rollback')
-
-                return self._rollback(dryrun, force, dsguard)
+                return self._rollback(dryrun, force)
             else:
                 self.ui.warn(_(b"no rollback information available\n"))
                 return 1
         finally:
-            release(dsguard, lock, wlock)
+            release(lock, wlock)
 
     @unfilteredmethod  # Until we get smarter cache management
-    def _rollback(self, dryrun, force, dsguard):
+    def _rollback(self, dryrun, force):
         ui = self.ui
 
         parents = self.dirstate.parents()
@@ -2772,9 +2769,6 @@
         self.invalidate()
 
         if parentgone:
-            # prevent dirstateguard from overwriting already restored one
-            dsguard.close()
-
             narrowspec.restorebackup(self, b'undo.narrowspec')
             narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate')
             self.dirstate.restorebackup(None, b'undo.dirstate')