Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 30501:77cd647b04ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: refer to dirstateguard by its new name
author Augie Fackler <augie@google.com>
date Mon, 21 Nov 2016 21:06:34 -0500
parents 2019fbdab075
children a90867a22daf
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Nov 21 21:06:22 2016 -0500
+++ b/mercurial/localrepo.py	Mon Nov 21 21:06:34 2016 -0500
@@ -31,6 +31,7 @@
     cmdutil,
     context,
     dirstate,
+    dirstateguard,
     encoding,
     error,
     exchange,
@@ -1141,7 +1142,7 @@
             wlock = self.wlock()
             lock = self.lock()
             if self.svfs.exists("undo"):
-                dsguard = cmdutil.dirstateguard(self, 'rollback')
+                dsguard = dirstateguard.dirstateguard(self, 'rollback')
 
                 return self._rollback(dryrun, force, dsguard)
             else: