Commits

Marcus Lindblom Sonestedt committed 45a4024

checkfiles: import match from scmutil (1.9+) and fallback to cmdutil (<=1.8) on fail (fixes #13)

Comments (0)

Files changed (1)

             if len(self.ctx.parents()) == 1:
                 # XXX would be nicer if checked_exts were a proper pattern;
                 # then cmdutil.match would work naturally with it
+                try:
+                    from scmutil import match
+                except ImportError:
+                    from cmdutil import match
+
                 file = None
                 hunk = None
                 lastlabel = None
                 for chunk, label in patch.diffui(self.repo,
                                                  self.ctx.p1().node(),
                                                  self.ctx.node(),
-                                                 cmdutil.match(self.repo)):
+                                                 match(self.repo)):
                     if len(label) > 0 or chunk != '\n':
                         self.ui.debug('checkfiles: %s="%s"\n' % (label, chunk))
                     if label == 'diff.file_b':
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.