Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 36986:afac8ab37c2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: drop redundant import of merge module
author Yuya Nishihara <yuya@tcha.org>
date Sun, 18 Mar 2018 12:54:03 +0900
parents c479692690ef
children 317382151ac3
comparison
equal deleted inserted replaced
36985:66e64681e0a8 36986:afac8ab37c2c
2356 # amend should abort if commitsubrepos is enabled 2356 # amend should abort if commitsubrepos is enabled
2357 assert not commitsubs 2357 assert not commitsubs
2358 if subs: 2358 if subs:
2359 subrepoutil.writestate(repo, newsubstate) 2359 subrepoutil.writestate(repo, newsubstate)
2360 2360
2361 # avoid cycle (TODO: should be removed in default branch)
2362 from . import merge as mergemod
2363 ms = mergemod.mergestate.read(repo) 2361 ms = mergemod.mergestate.read(repo)
2364 mergeutil.checkunresolved(ms) 2362 mergeutil.checkunresolved(ms)
2365 2363
2366 filestoamend = set(f for f in wctx.files() if matcher(f)) 2364 filestoamend = set(f for f in wctx.files() if matcher(f))
2367 2365