Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check-code: add rule to detect usage of external diff via extdiff
authorFUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Thu, 11 Feb 2016 02:15:45 +0900
changeset 28053 34a2944aac9b
parent 28052 b59ef0c21405
child 28054 8515b813976b
check-code: add rule to detect usage of external diff via extdiff This rule detects "hg extdiff" invocation without -p/--program and -o/--option. This patch specifies "-p diff" explicitly in test-extdiff.t to avoid false positive matching.
contrib/check-code.py file | annotate | diff | comparison | revisions
tests/test-extdiff.t file | annotate | diff | comparison | revisions 
--- a/contrib/check-code.py	Mon Feb 08 18:29:17 2016 +0900
+++ b/contrib/check-code.py	Thu Feb 11 02:15:45 2016 +0900
@@ -186,6 +186,9 @@
      "use '@@ -N,n +N* @@ (glob)' style chunk header for portability"),
     (r'^  @@ -[0-9]+ [+][0-9]+ @@',
      "use '@@ -N* +N* @@ (glob)' style chunk header for portability"),
+    (uprefix + r'hg( +-[^ ]+( +[^ ]+)?)* +extdiff'
+     r'( +(-[^ po-]+|--(?!program|option)[^ ]+|[^-][^ ]*))*$',
+     "use $RUNTESTDIR/pdiff via extdiff (or -o/-p for false-positives)"),
   ],
   # warnings
   [
--- a/tests/test-extdiff.t	Mon Feb 08 18:29:17 2016 +0900
+++ b/tests/test-extdiff.t	Thu Feb 11 02:15:45 2016 +0900
@@ -72,7 +72,7 @@
 
 Specifying an empty revision should abort.
 
-  $ hg extdiff --patch --rev 'ancestor()' --rev 1
+  $ hg extdiff -p diff --patch --rev 'ancestor()' --rev 1
   abort: empty revision on one side of range
   [255]
hg-stable