Changeset 27

Timestamp:

2008年07月30日 00时34分38秒 (4 years ago)

Author:

jiangx

Message:

store ,v file into RCS directory; bug in last commit: remove continue

Location:

trunk

Files:

• config/Makefile (modified) (1 diff)
• config/RCS (added)
• pysvnmanager/model/rcsbackup.py (modified) (2 diffs)
• pysvnmanager/tests/test_rcs_backup.py (modified) (3 diffs)
• pysvnmanager/websetup.py (modified) (1 diff)

trunk/config/Makefile

@@ -8 +8 @@
         @-rm $(CONFFILE) >/dev/null 2>&1
         @-rm localconfig.pyc >/dev/null 2>&1
-        @-rm *,v 2>&1
+        @-rm -f *,v RCS/*,v 2>&1
 
 %: $(SRCDIR)/%.in

trunk/pysvnmanager/model/rcsbackup.py

@@ -13 +13 @@
 
 def is_rcs_exist(wcfile):
-    rcsfile = wcfile+',v'
-    return os.access(rcsfile, os.F_OK)
+    wcpath = os.path.dirname(os.path.abspath(wcfile))
+    if os.path.isdir(wcpath+'/RCS'):
+        rcsfile = wcpath+'/RCS/'+os.path.basename(wcfile)+',v'
+    else:
+        rcsfile = wcfile+',v'
+    return os.path.exists(rcsfile)
 
 def get_unicode(msg, escape=False):
@@ -55 +59 @@
     for i in cmd:
         log.debug("Command: "+i)
-        continue
         try:
             buff = os.popen(i).read().strip()

trunk/pysvnmanager/tests/test_rcs_backup.py

@@ -14 +14 @@
 class TestRcsBackup(TestController):
     wcfile  = "%s/%s" % (os.path.dirname(os.path.abspath(__file__)), 'rcstest.txt')
-    rcsfile = wcfile+',v'
+    wcpath = os.path.dirname(os.path.abspath(wcfile))
+    if os.path.isdir(wcpath+'/RCS'):
+        rcsfile = wcpath+'/RCS/'+os.path.basename(wcfile)+',v'
+    else:
+        rcsfile = wcfile+',v'
 
     #def __init__(self, *args):
     #    super(TestController, self).__init__(*args)
-
  
     def setUp(self):
@@ -25 +28 @@
         if os.access(self.rcsfile, os.R_OK):
             os.remove(self.rcsfile)
-
 
     def tearDown(self):
@@ -60 +62 @@
         # Backup test. (rcs file not exist yet)
         self.writefile()
+        assert self.get_revision() == 1, self.get_revision()
         assert os.access(self.wcfile, os.R_OK)
         assert not os.access(self.rcsfile, os.R_OK)
         rcs.backup(self.wcfile)
         assert os.access(self.wcfile, os.R_OK)
-        assert os.access(self.rcsfile, os.R_OK)
+        assert os.path.exists(self.rcsfile)
+        assert os.access(self.rcsfile, os.R_OK), self.rcsfile
 
         # Backup test. (rcs exist already)

trunk/pysvnmanager/websetup.py

@@ -21 +21 @@
     if not os.path.exists(here+'/config'):
         os.mkdir(here+'/config')
+    if not os.path.exists(here+'/config/RCS'):
+        os.mkdir(here+'/config/RCS')
     filelist = ['svn.access', 'svn.passwd', 'localconfig.py']
     for f in filelist: