Commit 010a961e authored by Augie Fackler's avatar Augie Fackler
Browse files

commands: refer to dirstateguard by its new name

parent ee2097c560c1
......@@ -40,6 +40,7 @@ from . import (
dagparser,
dagutil,
destutil,
dirstateguard,
discovery,
encoding,
error,
......@@ -686,7 +687,7 @@ def _dobackout(ui, repo, node=None, rev=None, **opts):
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, *patches, **opts):
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 == '-':
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment