Don't look for $Header$ when using svn.

Subversion doesn't expand $Header$, so look only for $Id$ if using
subversion. In addition, the whole grepping code is now executed only
for CVS and Subversion.

diff --git a/bin/repoman b/bin/repoman
index 812f1df6727b15a832e77a5b4f3cdc9c0a049c08..78022f4e663ad29c0917f8f109d296509be5631e 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -2214,23 +2214,6 @@ else:
        mymanifests = list(mymanifests)
        myheaders = []
        mydirty = []
-       headerstring = "'\$(Header|Id)"
-       headerstring += ".*\$'"
-       for myfile in myupdates:
-
-               # for CVS, no_expansion contains files that are excluded from expansion
-               if vcs == "cvs":
-                       if myfile in no_expansion:
-                               continue
-
-               # for SVN, expansion contains files that are included in expansion
-               elif vcs == "svn":
-                       if myfile not in expansion:
-                               continue
-
-               myout = subprocess_getstatusoutput("egrep -q "+headerstring+" "+myfile)
-               if myout[0] == 0:
-                       myheaders.append(myfile)
 
        print("* %s files being committed..." % green(str(len(myupdates))), end=' ')
        if vcs in ('git', 'bzr', 'hg'):
@@ -2239,9 +2222,32 @@ else:
                # committed in one big commit at the end.
                print()
        else:
+               if vcs == 'cvs':
+                       headerstring = "'\$(Header|Id)"
+               elif vcs == 'svn':
+                       headerstring = "'\$Id"
+               headerstring += ".*\$'"
+
+               for myfile in myupdates:
+
+                       # for CVS, no_expansion contains files that are excluded from expansion
+                       if vcs == "cvs":
+                               if myfile in no_expansion:
+                                       continue
+
+                       # for SVN, expansion contains files that are included in expansion
+                       elif vcs == "svn":
+                               if myfile not in expansion:
+                                       continue
+
+               myout = subprocess_getstatusoutput("egrep -q "+headerstring+" "+myfile)
+               if myout[0] == 0:
+                       myheaders.append(myfile)
+
                print("%s have headers that will change." % green(str(len(myheaders))))
                print("* Files with headers will cause the " + \
                        "manifests to be made and recommited.")
+
        logging.info("myupdates: %s", myupdates)
        logging.info("myheaders: %s", myheaders)