Georg Brandl avatar Georg Brandl committed edc529e

Fix for hg 1.9.

Comments (0)

Files changed (1)

 #
 # changelog mercurial extension
 #
-# Copyright (c) 2008-2010 by Georg Brandl, Armin Ronacher.
+# Copyright (c) 2008-2011 by Georg Brandl, Armin Ronacher.
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 
 import re
 
-from mercurial import commands, cmdutil, extensions, patch
-
+from mercurial import commands, extensions, patch, match as matchmod
 
 _bullet_re = re.compile(r'\s*[-+*]\s+')
 
     # check if changelog changed
     logname = ui.config('changelog', 'filename', 'CHANGES')
     if pats:
-        match = cmdutil.match(repo, pats, opts)
+        match = matchmod.match(repo.root, repo.getcwd(), pats,
+                               opts.get('include'), opts.get('exclude'))
         if logname not in match:
             # changelog is not mentioned
             return orig_commit(ui, repo, *pats, **opts)
-    logmatch = cmdutil.match(repo, [logname], {})
+    logmatch = matchmod.match(repo.root, repo.getcwd(), [logname])
     logmatch.bad = lambda f, msg: None  # don't complain if file is missing
 
     # get diff of changelog
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.