Remove '$Id' tags; they are useless under git.

Fix checkFile for git.
bevalley · Nov 29, 2012 · 31cdbb5 · 31cdbb5
1 parent b6801fd
commit 31cdbb5
Show file tree

Hide file tree

Showing 222 changed files with 5,939 additions and 6,581 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,4 @@
-# $Id$
+# CHANGES.txt
 
 ###############################################################################
 

diff --git a/README.txt b/README.txt
@@ -1,5 +1,3 @@
-# $Id$
-
 olap4j, release 1.0.1
 
 Contents of this distribution

diff --git a/RELEASE_CHECKLIST.txt b/RELEASE_CHECKLIST.txt
@@ -1,5 +1,3 @@
-# $Id$
-
 olap4j release check-list
 =========================
 

diff --git a/build.properties b/build.properties
@@ -1,5 +1,4 @@
-#
-# $Id$
+# build.properties
 #
 # Licensed to Julian Hyde under one or more contributor license
 # agreements. See the NOTICE file distributed with this work for

diff --git a/build.xml b/build.xml
@@ -1,6 +1,4 @@
 <!--
-    == $Id$
-    ==
     == Licensed to Julian Hyde under one or more contributor license
     == agreements. See the NOTICE file distributed with this work for
     == additional information regarding copyright ownership.

diff --git a/checkFile.awk b/checkFile.awk
@@ -1,5 +1,4 @@
 #!/bin/gawk
-# $Id$
 #
 # Licensed to Julian Hyde under one or more contributor license
 # agreements. See the NOTICE file distributed with this work for
@@ -136,10 +135,6 @@ FNR == 1 {
         # generated; does not contain standard header
     } else if (1) {
         headers[headerCount++] = "/\\*$";
-        if (_isOlap4j(fname)) {
-            headers[headerCount++] = /^\/\/ \$Id: /;
-            headers[headerCount++] = "//";
-        }
         headers[headerCount++] = "// Licensed to Julian Hyde under one or more contributor license$";
         headers[headerCount++] = "// agreements. See the NOTICE file distributed with this work for$";
         headers[headerCount++] = "// additional information regarding copyright ownership.$";

diff --git a/checkFile.sh b/checkFile.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# $Id$
 #
 # Licensed to Julian Hyde under one or more contributor license
 # agreements. See the NOTICE file distributed with this work for
@@ -33,8 +32,7 @@ usage() {
     echo "checkFile  [ <options> ] <file>..."
     echo "    Checks a list of files."
     echo "checkFile  [ <options> ] --opened"
-    echo "    Checks all files that are opened for edit in the current"
-    echo "    perforce client."
+    echo "    Checks all files that are opened in git. Implies --strict."
     echo "checkFile  [ <options> ] --under <dir>"
     echo "    Recursively checks all files under a given directory."
     echo "checkFile --help"
@@ -171,7 +169,7 @@ doCheckDeferred() {
     if [ -s "${deferred_file}" ]; then
         maxLineLength=80
         cat "${deferred_file}" |
-        xargs gawk -f "$CHECKFILE_AWK" \
+        xargs -P $(expr ${CORE_COUNT} \* 2) -n 100 gawk -f "$CHECKFILE_AWK" \
             -v strict="$strict" \
             -v maxLineLength="$maxLineLength"
    fi
@@ -226,6 +224,7 @@ opened=
 if [ "$1" == --opened ]; then
     opened=true
     deferred=
+    strict=2
     shift
 fi
 
@@ -272,10 +271,9 @@ if [ "$under" ]; then
         doCheck "$filePath" "$file" ""
     done
 elif [ "$opened" ]; then
-    p4 opened |
-    gawk -F'#' '$2 !~ / - delete/ {print $1}' |
-    while read line; do
-        file=$(p4 where "$line" | gawk '{print $3}' | tr \\\\ /)
+    git checkout |
+    gawk '$1 != "D" {print $2}' |
+    while read file; do
         doCheck "$file" "$file" "80"
     done
 else
@@ -302,4 +300,3 @@ rm -f /tmp/checkFile_output_$$.txt
 exit $status
 
 # End checkFile.sh
-
diff --git a/doc/index.html b/doc/index.html
@@ -3,8 +3,6 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <!--
-  == $Id$
-  ==
   == Licensed to Julian Hyde under one or more contributor license
   == agreements. See the NOTICE file distributed with this work for
   == additional information regarding copyright ownership.