Patchwork [04,of,10,layering] commands: refer to dirstateguard by its new name

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

Comments

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

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -40,6 +40,7 @@  from . import (
     dagparser,
     dagutil,
     destutil,
+    dirstateguard,
     discovery,
     encoding,
     error,
@@ -686,7 +687,7 @@  def _dobackout(ui, repo, node=None, rev=
     bheads = repo.branchheads(branch)
     rctx = scmutil.revsingle(repo, hex(parent))
     if not opts.get('merge') and op1 != node:
-        dsguard = cmdutil.dirstateguard(repo, 'backout')
+        dsguard = dirstateguard.dirstateguard(repo, 'backout')
         try:
             ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                          'backout')
@@ -4884,7 +4885,7 @@  def import_(ui, repo, patch1=None, *patc
             lock = repo.lock()
             tr = repo.transaction('import')
         else:
-            dsguard = cmdutil.dirstateguard(repo, 'import')
+            dsguard = dirstateguard.dirstateguard(repo, 'import')
         parents = repo[None].parents()
         for patchurl in patches:
             if patchurl == '-':