Changeset 92

Timestamp:

2009年08月23日 12时15分25秒 (2 years ago)

Author:

jiangx

Message:

Fixed #26: EolStyleCheck? plugin enhancement : in loose mode, svn:eol-style no need for unix files.

Location:

trunk/pysvnmanager/hooks

Files:

• init/hook1.4/pre-commit (modified) (1 diff)
• init/hook1.4/scripts/check-mime-type.py (modified) (3 diffs)
• init/hook1.5/pre-commit (modified) (1 diff)
• init/hook1.5/scripts/check-mime-type.py (modified) (3 diffs)
• plugins/EolStyleCheck.py (modified) (6 diffs)

trunk/pysvnmanager/hooks/init/hook1.4/pre-commit

@@ -73 +73 @@
 if [ "$eol_style_check" = "yes" ]; then
     # New file must set svn:mime-type and svn:eol-style
-    $TOOLS_DIR/check-mime-type.py "$REPOS" "$TXN" || exit 1
+    $TOOLS_DIR/check-mime-type.py "$REPOS" "$TXN" $eol_style_check_force || exit 1
 fi
 

trunk/pysvnmanager/hooks/init/hook1.4/scripts/check-mime-type.py

@@ -27 +27 @@
 MIN_LENGTH = 5
 
-def main(repos, txn):
+def main(repos, txn, force=""):
     """main entry point"""
+    
+    if force == "no":
+        force = False 
+    else:
+        force = True
 
     files_added = []
@@ -62 +67 @@
         
         if check_mime:
-            if mime_type == "" and eol_style == '':
-                errmsg.append( "%s : 属性 svn:mime-type 或者 svn:eol-style 没有设置" % path.decode('utf-8','replace').encode('utf-8','replace') )
-            elif ptext.match(mime_type) and eol_style == '':
-                errmsg.append( "%s : svn:mime-type=%s 但是 svn:eol-style 没有设置" % (path.decode('utf-8','replace').encode('utf-8','replace'), mime_type) )
+            if mime_type == "" or ptext.match(mime_type):
+                if eol_style == '':
+                    ## check if crlf in file contents
+                    if not force:
+                        if crlf_in_file(txn, repos, path):
+                            errmsg.append( "CRLF (DOS style EOL) in file: %s" % path.decode('utf-8','replace').encode('utf-8','replace') )
+                        else:
+                            continue
+                    if mime_type == "":
+                        errmsg.append( "%s : 属性 svn:mime-type 或者 svn:eol-style 没有设置" % path.decode('utf-8','replace').encode('utf-8','replace') )
+                    else:
+                        errmsg.append( "%s : svn:mime-type=%s 但是 svn:eol-style 没有设置" % (path.decode('utf-8','replace').encode('utf-8','replace'), mime_type) )
 
     if len( errmsg ) > 0:
         die( errmsg )
 
-
+def crlf_in_file(txn, repos, path):
+    cmd = '%s cat -t "%s" "%s" "%s"' % (SVNLOOK, txn, repos, path)
+    buff = os.popen(cmd, 'r').read(1024)
+    if '\r' in buff:
+        return True
+    else:
+        return False
+ 
 def die(msg):
     """
@@ -106 +126 @@
         sys.stderr.write("Usage: %s REPOS TXN\n" % (sys.argv[0]))
     else:
-        main(sys.argv[1], sys.argv[2])
+        main(sys.argv[1], sys.argv[2], sys.argv[3:] and sys.argv[3] or '')

trunk/pysvnmanager/hooks/init/hook1.5/pre-commit

@@ -73 +73 @@
 if [ "$eol_style_check" = "yes" ]; then
     # New file must set svn:mime-type and svn:eol-style
-    $TOOLS_DIR/check-mime-type.py "$REPOS" "$TXN" || exit 1
+    $TOOLS_DIR/check-mime-type.py "$REPOS" "$TXN" $eol_style_check_force || exit 1
 fi
 

trunk/pysvnmanager/hooks/init/hook1.5/scripts/check-mime-type.py

@@ -27 +27 @@
 MIN_LENGTH = 5
 
-def main(repos, txn):
+def main(repos, txn, force=""):
     """main entry point"""
+    
+    if force == "no":
+        force = False 
+    else:
+        force = True
 
     files_added = []
@@ -62 +67 @@
         
         if check_mime:
-            if mime_type == "" and eol_style == '':
-                errmsg.append( "%s : 属性 svn:mime-type 或者 svn:eol-style 没有设置" % path.decode('utf-8','replace').encode('utf-8','replace') )
-            elif ptext.match(mime_type) and eol_style == '':
-                errmsg.append( "%s : svn:mime-type=%s 但是 svn:eol-style 没有设置" % (path.decode('utf-8','replace').encode('utf-8','replace'), mime_type) )
+            if mime_type == "" or ptext.match(mime_type):
+                if eol_style == '':
+                    ## check if crlf in file contents
+                    if not force:
+                        if crlf_in_file(txn, repos, path):
+                            errmsg.append( "CRLF (DOS style EOL) in file: %s" % path.decode('utf-8','replace').encode('utf-8','replace') )
+                        else:
+                            continue
+                    if mime_type == "":
+                        errmsg.append( "%s : 属性 svn:mime-type 或者 svn:eol-style 没有设置" % path.decode('utf-8','replace').encode('utf-8','replace') )
+                    else:
+                        errmsg.append( "%s : svn:mime-type=%s 但是 svn:eol-style 没有设置" % (path.decode('utf-8','replace').encode('utf-8','replace'), mime_type) )
 
     if len( errmsg ) > 0:
         die( errmsg )
 
-
+def crlf_in_file(txn, repos, path):
+    cmd = '%s cat -t "%s" "%s" "%s"' % (SVNLOOK, txn, repos, path)
+    buff = os.popen(cmd, 'r').read(1024)
+    if '\r' in buff:
+        return True
+    else:
+        return False
+ 
 def die(msg):
     """
@@ -106 +126 @@
         sys.stderr.write("Usage: %s REPOS TXN\n" % (sys.argv[0]))
     else:
-        main(sys.argv[1], sys.argv[2])
+        main(sys.argv[1], sys.argv[2], sys.argv[3:] and sys.argv[3] or '')

trunk/pysvnmanager/hooks/plugins/EolStyleCheck.py

@@ -39 +39 @@
     
     # Plugin config option/value in config ini file.
-    key = "eol_style_check"
-    value = "yes"
+    key_switch = "eol_style_check"
+    key_force  = "eol_style_check_force"
     
     section = 'pre_commit'
@@ -49 +49 @@
         Simply call 'has_config()'.
         """
-        return self.has_config()
+        return self.has_config(self.key_switch)
     
     def install_info(self):
@@ -58 +58 @@
         reST reference: http://docutils.sourceforge.net/docs/user/rst/quickref.html
         """
-        return self.description
+        result = self.description
+        if self.enabled():
+            result += "\n\n"
+            result += "**" + _("Current configuration") + "**\n\n"
+            force = self.get_config(self.key_force)
+            if force == "no":
+                result += "- " + _("Loose mode: permit checkin without svn:eol-style properity if no CRLF in text file.")
+            else:
+                result += "- " + _("Strict mode: must have svn:eol-style even if not CRLF in text file.")
+
+        return result
+ 
     
     def install_config_form(self):
@@ -66 +77 @@
         Any html and javascript are welcome.
         """
-        return ""
+        if self.get_config(self.key_force)=="no":
+            enable_checked  = ""
+            disable_checked = "checked"
+        else:
+            enable_checked  = "checked"
+            disable_checked = ""
+
+        result = ""
+        result += "<p><strong>%s</strong></p>" % _("Fill this form")
+        result += "<blockquote>"
+        result += "<dl>"
+        result += "\n<dt>"
+        result += "<input type='radio' name='force' value='yes' " + \
+                enable_checked  + ">" + _("Strict mode") + "&nbsp;"
+        result += "\n<dd>"
+        result += _("Must set svn:eol-style even if CRLF not in text file (in Unix format).")
+        result += "\n<dt>"
+        result += "<input type='radio' name='force' value='no' " + \
+                disable_checked + ">" + _("Loose mode") + "<br>"
+        result += "\n<dd>"
+        result += _("Permit checkin without svn:eol-style properity if is in Unix file format (no crlf in text file).")
+        result += "\n</dl>"
+        result += "</blockquote>"
+        return result
         
     def uninstall(self):
@@ -73 +107 @@
         Simply call 'unset_config()' and 'save()'.
         """
-        self.unset_config()
+        self.unset_config(self.key_switch)
+        self.unset_config(self.key_force)
         self.save()
     
@@ -83 +118 @@
         Form fields in setup_config() will pass as params.
         """
-        self.set_config()
+        force = params.get('force', 'no')
+        if force != 'no':
+            force = 'yes'
+        self.set_config(self.key_switch, 'yes')
+        self.set_config(self.key_force, force)
         self.save()