Changeset 30

Timestamp:

2008年07月30日 17时11分05秒 (4 years ago)

Author:

jiangx

Message:

See #7: add cat, differ function.

Location:

trunk/pysvnmanager

Files:

• model/rcsbackup.py (modified) (5 diffs)
• tests/test_rcs_backup.py (modified) (3 diffs)

trunk/pysvnmanager/model/rcsbackup.py

@@ -62 +62 @@
     if not is_rcs_exist(wcfile):
         # -l : lock mode, make wcfile writable
-        cmd.append('%(cmd)s -i -q -l -t-"%(msg)s" -w"%(user)s" %(file)s 2>&1' % \
+        cmd.append('%(cmd)s -i -q -l -t-"%(msg)s" -w"%(user)s" "%(file)s" 2>&1' % \
                 {'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 -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 -l -m"%(msg)s" -w"%(user)s" "%(file)s" 2>&1' % \
                 {'cmd':CMD_CI, "file":wcfile, "msg":comment, "user":user})
 
@@ -92 +92 @@
         opts = "-u%s" % revision
 
-    cmd = "%(cmd)s %(opts)s -q -f %(file)s 2>&1" % {'cmd':CMD_CO, "opts":opts, "file":wcfile }
+    cmd = '%(cmd)s %(opts)s -q -f "%(file)s" 2>&1' % {'cmd':CMD_CO, "opts":opts, "file":wcfile }
     buff = os.popen(cmd).read().strip()
     if buff:
         raise Exception, "Command: %s\nError Message: %s\n" % (cmd, buff)
-    
+
+
+def cat(wcfile, revision=""):
+    if not wcfile or not is_rcs_exist(wcfile):
+        return ""
+    opts = "-p"
+    if revision:
+        # -pRev : cat rather then checkout
+        opts = "-p%s" % revision
+
+    cmd = '%(cmd)s %(opts)s -q "%(file)s"' % {'cmd':CMD_CO, "opts":opts, "file":wcfile }
+    buff = os.popen(cmd).read().strip()
+    return buff
+
+def differ(filename, rev1="", rev2=""):
+    filename=get_utf8(filename)
+    opts=""
+    if rev1 and rev2:
+        opts="-r%s -r%s" % (rev1, rev2)
+    elif rev1 or rev2:
+        opts="-r%s%s" % (rev1, rev2)
+        
+    cmd = '%(cmd)s %(opts)s -u -q "%(file)s"' % {'cmd':CMD_RCSDIFF, 'opts':opts, 'file':filename}
+    log.debug('Command: '+cmd)
+    buff = os.popen(cmd).read()
+    return buff
 
 class RcsLog(object):
@@ -145 +170 @@
     
     def reload(self):
-        cmd = '%(cmd)s -L -h -N %(file)s' % {'cmd':CMD_RLOG, 'file':self.__file}
+        cmd = '%(cmd)s -L -h -N "%(file)s"' % {'cmd':CMD_RLOG, 'file':self.__file}
         buff = os.popen(cmd).read().strip()
         
@@ -213 +238 @@
             opts="%s,%s" % (opts, rev3)
 
-        cmd = '%(cmd)s %(opts)s -L -N %(file)s' % {'cmd':CMD_RLOG, 'opts':opts, 'file':self.__file}
+        cmd = '%(cmd)s %(opts)s -L -N "%(file)s"' % {'cmd':CMD_RLOG, 'opts':opts, 'file':self.__file}
         log.debug('Command: '+cmd)
         buff = os.popen(cmd).read().strip().rstrip('=').rstrip()
@@ -265 +290 @@
         
         return self.revs
+    
+    def cat(self, revision=""):
+        return cat(self.__file, revision)
+    
+    def differ(self, rev1="", rev2=""):
+        return differ(self.__file, rev1, rev2)
+        

trunk/pysvnmanager/tests/test_rcs_backup.py

@@ -45 +45 @@
         f.write('='*20 + '\n')
         f.write('Revision: %d\n' % rev)
-        f.write('Date: %s\n' % time.strftime('%F %T'))
+        f.write('Date: %s\n' % time.strftime('%F'))
         f.close()
 
@@ -199 +199 @@
                 [x['revision'] for x in logs]
 
+        buff = rcslog.differ('1.2','1.5')
+        assert "-Revision: 2\n+Revision: 5" in buff, buff
+        buff = rcslog.differ('1.13')
+        assert "-Revision: 13\n+Revision: 14" in buff, buff
+        
+        buff = rcslog.cat()
+        assert "Revision: 14\n" in buff, buff
+
+        buff = rcslog.cat('1.8')
+        assert "Revision: 8\n" in buff, buff
         
     def testLogsNone(self):
@@ -205 +215 @@
         assert rcslog.total == 0, rcslog.total
         assert rcslog.get_page_logs(1) == [], rcslog.get_page_logs(1)
+        assert rcslog.cat()==""
         
 if __name__ == '__main__':