Patchwork [05,of,10,layering] localrepo: refer to dirstateguard by its new name

login
register
mail settings
Submitter Augie Fackler
Date Nov. 22, 2016, 3:05 a.m.
Message ID <fe0b18c02e53589b043c.1479783920@imladris.local>
Download mbox | patch
Permalink /patch/17681/
State Accepted
Headers show

Comments

Augie Fackler - Nov. 22, 2016, 3:05 a.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1479780394 18000
#      Mon Nov 21 21:06:34 2016 -0500
# Node ID fe0b18c02e53589b043cff35f6987fdf63d855fb
# Parent  7869b39b3bd3c28f7bf6cf9c6c921dc6de254b9d
localrepo: refer to dirstateguard by its new name

Patch

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: