Fernando  G N Rocha avatar Fernando G N Rocha committed 3ba748a

Fix for mercurial 1.9

Comments (0)

Files changed (1)

 import re
 import fnmatch
 
-from mercurial import commands, cmdutil, extensions, patch
+from mercurial import commands, cmdutil, extensions, patch, util
+
+if util.version() >= '1.9':
+    # cmdutil.match and cmdutil.revpair moved to scmutil
+    from mercurial import scmutil
+    utilmodule = scmutil
+else:
+    utilmodule = cmdutil
 
 try:
     # use the color extension to render diffs, if it is recent enough
 
 def new_commit(orig_commit, ui, repo, *pats, **opts):
     smelly_count = 0
-    match = cmdutil.match(repo, pats, opts)
-    revs = cmdutil.revpair(repo, None)
+    if not hasattr(repo, 'match'):
+        match = utilmodule.match(repo[None], pats, opts)
+    else:
+        match = utilmodule.match(repo, pats, opts)
+
+    revs = utilmodule.revpair(repo, None)
     changes = repo.status(*revs, match=match)
     if changes[1]:
         # check if any added files would be ignored
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.