Mercurial > hg-stable

diff mercurial/cmdutil.py @ 30506:002fa4d79466

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Augie Fackler <augie@google.com>
date Mon, 21 Nov 2016 21:36:46 -0500
parents c1149533676b
children d9d8d78e6bc9
line wrap: on
line diff
--- 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