Yes. :-)

I pushed a new version. Does this fix the issue?

Here's what I added (modified start of uncrustify.py):

============================================================
import sys

print >> sys.stderr, 1

from mercurial import cmdutil
from mercurial import util
print >> sys.stderr, 2
try:
    # Mercurial >= 1.8
    print >> sys.stderr, "ATTEMPTING IMPORT"
    from mercurial import scmutil
    print >> sys.stderr, "IMPORT SUCCEEDED"
    print >> sys.stderr, scmutil
    def match_func(repo, ctx, patterns, options):
        print "CALLING scmutil.match"
        return scmutil.match(ctx, patterns, options)
except ImportError:
    print >> sys.stderr, "IMPORT FAILED"
    def match_func(repo, ctx, patterns, options):
        print "CALLING cmdutil.match"
        return cmdutil.match(repo, patterns, options)
print >> sys.stderr, 3
============================================================

and here is the output:

1
2
ATTEMPTING IMPORT
IMPORT SUCCEEDED
<unloaded module 'scmutil'>
3
CALLING scmutil.match
abort: No module named scmutil!


I assume what happens is that Mercurial installs some lazy importing scheme
(probably to reduce start-up overhead due to imports, which can be very
significant for programs the size of mercurial, especially if large parts of the
code are usually not used). Hence no ImportError is raised.

The simplest solution is to use
from mercurial.scmutil import scmutil_match
to force the module to be actually imported. I'd also add a comment that
explains why we do this.

Indeed it looks strange. I'll try to add some debug output.

I don't see how this error could happen. Do you?

$ hg uncrustify 
abort: No module named scmutil!

Ok, I changed this and fixed two small bugs as well.

Works! I think it would be cleaner to encapsulate the version-specific stuff
close to the imports rather than inside the main code though; a la:

try:
    from ... import
    def get_match_func(repo, ctx, patterns, options):
        ...
else:
    def get_match_func(repo, ctx, patterns, options):
        ...

Sorry, the push didn't go through. Now it did. Can you confirm that the 
fix works?

I see no incoming changes, so can't test this, but in any case: on the three
machines I have access to, no file named "scmutil.py" exists. I think it'd be
good to support both the old and new function.

Yes, this seems to fix it. I just pushed the fix, does it work for your 
hg version?

I have no way to test this, but according to
http://mercurial.selenic.com/wiki/ApiChanges#Changes_after_1.8:

'Various functions have been moved from cmdutil.py to scmutil.py, including
revrange/revsingle/revpair and match/matchall/matchfiles'

Can you test if scmutil.match can be used instead? Note also this comment:

'scmutil.match (formerly cmdutil.match) now requires a context argument
(35c2cc322ba8), typically "repo[None]"'

Just a heads up: The uncrustify extension is not working with newer Python or Mercurial:

 hg uncrustify 
** unknown exception encountered, please report by visiting
**  http://mercurial.selenic.com/wiki/BugTracker
** Python 2.7.3 (default, Apr 20 2012, 22:39:59) [GCC 4.6.3]
** Mercurial Distributed SCM (version 2.0.2)
** Erweiterungen geladen: fetch, extdiff, color, convert, purge, transplant, uncrustify
Traceback (most recent call last):
  File "/usr/bin/hg", line 38, in <module>
    mercurial.dispatch.run()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 27, in run
    sys.exit(dispatch(request(sys.argv[1:])))
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 64, in dispatch
    return _runcatch(req)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 87, in _runcatch
    return _dispatch(req)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 684, in _dispatch
    cmdpats, cmdoptions)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 466, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/usr/lib/python2.7/dist-packages/mercurial/extensions.py", line 184, in wrap
    return wrapper(origfn, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/hgext/color.py", line 373, in colorcmd
    return orig(ui_, opts, cmd, cmdfunc)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 738, in _runcommand
    return checkargs()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 692, in checkargs
    return cmdfunc()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 681, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 458, in check
    return func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 348, in __call__
    util.checksignature(self.fn)(ui, *args, **opts)
  File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 458, in check
    return func(*args, **kwargs)
  File "/home/jendrik/projects/Downward/downward/misc/uncrustify.py", line 131, in uncrustify
    paths = [path for path in _get_files(repo, patterns, options)
  File "/home/jendrik/projects/Downward/downward/misc/uncrustify.py", line 76, in _get_files
    match = cmdutil.match(repo, patterns, options)
AttributeError: 'module' object has no attribute 'match'
Error in sys.excepthook:
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/apport_python_hook.py", line 64, in apport_excepthook
    from apport.fileutils import likely_packaged, get_recent_crashes
  File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 95, in _demandimport
    return _import(name, globals, locals, fromlist, level)
  File "/usr/lib/python2.7/dist-packages/apport/__init__.py", line 1, in <module>
    from apport.report import Report
  File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 114, in _demandimport
    mod = _origimport(name, globals, locals)
  File "/usr/lib/python2.7/dist-packages/apport/report.py", line 155, in <module>
    class Report(problem_report.ProblemReport):
  File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 86, in __getattribute__
    self._load()
  File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 58, in _load
    mod = _origimport(head, globals, locals)
  File "/usr/lib/python2.7/dist-packages/problem_report.py", line 93, in <module>
    class ProblemReport(UserDict):
TypeError: Error when calling the metaclass bases
    module.__init__() takes at most 2 arguments (3 given)

Original exception was:
Traceback (most recent call last):
  File "/usr/bin/hg", line 38, in <module>
    mercurial.dispatch.run()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 27, in run
    sys.exit(dispatch(request(sys.argv[1:])))
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 64, in dispatch
    return _runcatch(req)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 87, in _runcatch
    return _dispatch(req)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 684, in _dispatch
    cmdpats, cmdoptions)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 466, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/usr/lib/python2.7/dist-packages/mercurial/extensions.py", line 184, in wrap
    return wrapper(origfn, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/hgext/color.py", line 373, in colorcmd
    return orig(ui_, opts, cmd, cmdfunc)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 738, in _runcommand
    return checkargs()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 692, in checkargs
    return cmdfunc()
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 681, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 458, in check
    return func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 348, in __call__
    util.checksignature(self.fn)(ui, *args, **opts)
  File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 458, in check
    return func(*args, **kwargs)
  File "/home/jendrik/projects/Downward/downward/misc/uncrustify.py", line 131, in uncrustify
    paths = [path for path in _get_files(repo, patterns, options)
  File "/home/jendrik/projects/Downward/downward/misc/uncrustify.py", line 76, in _get_files
    match = cmdutil.match(repo, patterns, options)
AttributeError: 'module' object has no attribute 'match'