# HG changeset patch # User Augie Fackler # Date 2016-11-22 02:06:34 # Node ID 77cd647b04ac57a681b198d9bb2a54a578d7cca2 # Parent 13251523b20c2ef25a4e576a74b935a4a95ee2d2 localrepo: refer to dirstateguard by its new name diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -31,6 +31,7 @@ from . import ( cmdutil, context, dirstate, + dirstateguard, encoding, error, exchange, @@ -1141,7 +1142,7 @@ class localrepository(object): 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: