--- a/mercurial/commands.py	Thu Sep 08 22:44:10 2016 +0900
+++ b/mercurial/commands.py	Sun Aug 21 12:40:02 2016 +0900
@@ -3515,6 +3515,7 @@
       _('print parsed tree after optimizing (DEPRECATED)')),
      ('p', 'show-stage', [],
       _('print parsed tree at the given stage'), _('NAME')),
+     ('', 'no-optimized', False, _('evaluate tree without optimization')),
      ],
     ('REVSPEC'))
 def debugrevspec(ui, repo, expr, **opts):
@@ -3530,6 +3531,8 @@
         ('analyzed', revset.analyze),
         ('optimized', revset.optimize),
     ]
+    if opts['no_optimized']:
+        stages = stages[:-1]
     stagenames = set(n for n, f in stages)
 
     showalways = set()