Patchwork [02,of,10,layering] mq: refer to dirstateguard by its new name

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

Comments

Augie Fackler - Nov. 22, 2016, 3:05 a.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1479780352 18000
#      Mon Nov 21 21:05:52 2016 -0500
# Node ID 68b751b930e60a4d3d9f37b34bc31ee0a4467f72
# Parent  459f26a431fe7d04f7f935ccf46a3aec66956d84
mq: refer to dirstateguard by its new name

Patch

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -79,6 +79,7 @@  from mercurial.node import (
 from mercurial import (
     cmdutil,
     commands,
+    dirstateguard,
     dispatch,
     error,
     extensions,
@@ -1725,7 +1726,7 @@  class queue(object):
 
             dsguard = None
             try:
-                dsguard = cmdutil.dirstateguard(repo, 'mq.refresh')
+                dsguard = dirstateguard.dirstateguard(repo, 'mq.refresh')
                 if diffopts.git or diffopts.upgrade:
                     copies = {}
                     for dst in a: