# HG changeset patch # User Augie Fackler # Date 1479782206 18000 # Node ID 002fa4d7946627a2f78ae3a770e1a7a7d82391e0 # Parent a90867a22dafa45652f7e61dc2163ec87bf75a31 cmdutil: turn forward of checkunresolved into a deprecation warning As with dirstateguard, I really doubt anyone outside core was using this, as my grep over the repositories I keep locally suggests nobody was using this. If others are comfortable with it, let's drop the forward entirely. diff -r a90867a22daf -r 002fa4d79466 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Mon Nov 21 21:32:55 2016 -0500 +++ b/mercurial/cmdutil.py Mon Nov 21 21:36:46 2016 -0500 @@ -3408,7 +3408,10 @@ return cmd -checkunresolved = mergeutil.checkunresolved +def checkunresolved(ms): + ms._repo.ui.deprecwarn('checkunresolved moved from cmdutil to mergeutil', + '4.1') + return mergeutil.checkunresolved(ms) # a list of (ui, repo, otherpeer, opts, missing) functions called by # commands.outgoing. "missing" is "missing" of the result of