Changeset 89

Timestamp:

2009年05月13日 22时39分44秒 (3 years ago)

Author:

jiangx

Message:

merge with trunk r84:88. see #13.

Location:

branches/0.2-pylons_0.9.6.2

Files:

• . (modified) (1 prop)
• contrib/subversion (copied) (copied from trunk/contrib/subversion)
• contrib/subversion/30060_fnmatch_section_name.patch (copied) (copied from trunk/contrib/subversion/30060_fnmatch_section_name.patch)
• pySvnManager.egg-info (modified) (1 prop)
• pySvnManager.egg-info/SOURCES.txt (modified) (2 diffs)
• pysvnmanager (modified) (1 prop)
• pysvnmanager/model/my_fnmatch.py (copied) (copied from trunk/pysvnmanager/model/my_fnmatch.py)
• pysvnmanager/model/rcsbackup.py (modified) (2 diffs)
• pysvnmanager/model/svnauthz.py (modified) (5 diffs)

branches/0.2-pylons_0.9.6.2/pySvnManager.egg-info/SOURCES.txt

@@ -9 +9 @@
 config/README
 contrib/mantis/021_checkin_user_as_bug_submit_user.patch
+contrib/subversion/30060_fnmatch_section_name.patch
 contrib/trac/10110_trac_svn_hooks_chgset_date.patch
 contrib/trac/10115_trac_svn_hooks_ticket_range.patch
@@ -130 +131 @@
 pysvnmanager/model/configobj.py
 pysvnmanager/model/hooks.py
+pysvnmanager/model/my_fnmatch.py
 pysvnmanager/model/rcsbackup.py
 pysvnmanager/model/repos.py

branches/0.2-pylons_0.9.6.2/pysvnmanager/model/rcsbackup.py

@@ -69 +69 @@
                 {'cmd':CMD_CI, "file":wcfile, "msg":comment, "user":user})
         # -U : set locking to no-strict.
-        cmd.append('%(cmd)s -U -q "%(file)s"' % {'cmd':CMD_RCS, "file":wcfile})
+        cmd.append('%(cmd)s -U -u -M -q "%(file)s"' % {'cmd':CMD_RCS, "file":wcfile})
     else:
         # Warning: w/o -l or -u option, wcfile will be removed after checkin.
         # -l makes wcfile writable;
         # -u : wcfile is not writable unless rcsfile is set to no-strict locking.
-        cmd.append('%(cmd)s -q -l -m"%(msg)s" -w"%(user)s" "%(file)s" 2>&1' % \
+        cmd.append('%(cmd)s -q -u -m"%(msg)s" -w"%(user)s" "%(file)s" 2>&1' % \
                 {'cmd':CMD_CI, "file":wcfile, "msg":comment, "user":user})
 
@@ -85 +85 @@
         else:
             if buff:
+                os.system('%(cmd)s -U -u -M -q "%(file)s"' % {'cmd':CMD_RCS, "file":wcfile})
                 raise Exception, "Error Message: %s\n" % buff
 

branches/0.2-pylons_0.9.6.2/pysvnmanager/model/svnauthz.py

@@ -28 +28 @@
 import sys
 import os
+import my_fnmatch
 import StringIO
 import logging
@@ -1008 +1009 @@
 
         for i in self.module_list:
-            if i.path == path:
+            if i.path.lower() == path.lower():
                 return i
         i = Module(repos=self.name , path=path)
@@ -1031 +1032 @@
 
         for i in self.module_list:
-            if i.path == path:
+            if i.path.lower() == path.lower():
                 return i
+        # OSSXP hacked subversion supports wildcard characters as module path.
+        for i in self.module_list:
+            if '*' in i.path or '?' in i.path:
+                if my_fnmatch.fnmatch(path, i.path):
+                    return i
         return None
 
@@ -1075 +1081 @@
 
         for repos in self.repos_list:
-            if repos.name == name:
+            if repos.name.lower() == name.lower():
                 return repos
 
@@ -1102 +1108 @@
 
         repos = self.repos_list[idx]
-        assert(repos.name == name)
+        assert(repos.name.lower() == name.lower())
 
         if recursive: