Mercurial > hg

changeset 30491:13251523b20c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: refer to dirstateguard by its new name
author Augie Fackler <augie@google.com>
date Mon, 21 Nov 2016 21:06:22 -0500
parents ee2097c560c1
children 77cd647b04ac
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Nov 21 21:27:12 2016 -0500
+++ b/mercurial/commands.py	Mon Nov 21 21:06:22 2016 -0500
@@ -40,6 +40,7 @@
     dagparser,
     dagutil,
     destutil,
+    dirstateguard,
     discovery,
     encoding,
     error,
@@ -686,7 +687,7 @@
     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 @@
             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 == '-':