[Revisionmanager-devel] RevisionObjects CHANGES.txt,1.1,1.2 Revisioner.py,1.3,1.4

[panjunyong <pan...@us...>]

Update of /cvsroot/revisionmanager/RevisionObjects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23603

Modified Files:
	CHANGES.txt Revisioner.py 
Log Message:
add two method: rm_getRevision and rm_revert


Index: Revisioner.py
===================================================================
RCS file: /cvsroot/revisionmanager/RevisionObjects/Revisioner.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Revisioner.py	10 Apr 2004 16:02:50 -0000	1.3
--- Revisioner.py	12 Apr 2004 16:10:15 -0000	1.4
***************
*** 24,30 ****
  
      names = ['_rm_getRM', 'rm_getRelativePath', 'rm_getSettings',
!              'rm_getStatus', 'rm_getDiff', 'rm_getLog', 'rm_add',
               'rm_remove', 'rm_updateStatus', 'rm_update',
!              'rm_forceCheckout', 'rm_commit', 'rm_versioningForm',
               'rm_diffForm', 'rm_logForm']
  
--- 24,30 ----
  
      names = ['_rm_getRM', 'rm_getRelativePath', 'rm_getSettings',
!              'rm_getStatus', 'rm_getDiff', 'rm_getLog', 'rm_add', 'rm_revert',
               'rm_remove', 'rm_updateStatus', 'rm_update',
!              'rm_forceCheckout', 'rm_getRevision', 'rm_commit', 'rm_versioningForm',
               'rm_diffForm', 'rm_logForm']
  
***************
*** 45,52 ****
          (Permissions.RMManage,
           ('rm_getRelativePath', 'rm_getStatus', 'rm_getDiff',
!           'rm_getLog', 'rm_updateStatus', 'rm_versioningForm',
            'rm_diffForm', 'rm_logForm')),
          (Permissions.RMUpdate,
!          ('rm_update', 'rm_forceCheckout')),
          (Permissions.RMAddRemove,
           ('rm_add', 'rm_remove')),
--- 45,52 ----
          (Permissions.RMManage,
           ('rm_getRelativePath', 'rm_getStatus', 'rm_getDiff',
!           'rm_getLog', 'rm_updateStatus', 'rm_getRevision', 'rm_versioningForm',
            'rm_diffForm', 'rm_logForm')),
          (Permissions.RMUpdate,
!          ('rm_update', 'rm_forceCheckout', 'rm_revert')),
          (Permissions.RMAddRemove,
           ('rm_add', 'rm_remove')),
***************
*** 86,95 ****
              return {}
  
!     def rm_getDiff(self):
          rm = self._rm_getRM()
          if rm is None:
              return ''
          path = self.rm_getRelativePath()
!         return rm.diff([path])
  
      def rm_getLog(self):
--- 86,95 ----
              return {}
  
!     def rm_getDiff(self, rev1='', rev2=''):
          rm = self._rm_getRM()
          if rm is None:
              return ''
          path = self.rm_getRelativePath()
!         return rm.diff([path], rev1, rev2)
  
      def rm_getLog(self):
***************
*** 100,103 ****
--- 100,115 ----
          return rm.log([path])
  
+     def rm_revert(self, REQUEST=None, RESPONSE=None, rev=''):
+         """
+         revert to a history revision
+         """
+         rm = self._rm_getRM()
+         if rm is None:
+             return ''
+         path = self.rm_getRelativePath()
+         rm.merge(path, rev)
+         if RESPONSE:
+             RESPONSE.redirect(self.absolute_url() + '/rm_versioningForm')
+ 
      # management views
  
***************
*** 106,110 ****
      rm_logForm = PageTemplateFile("www/log.pt", globals())
  
!     def rm_add(self, REQUEST, RESPONSE):
          """
          Add to the repository
--- 118,122 ----
      rm_logForm = PageTemplateFile("www/log.pt", globals())
  
!     def rm_add(self, REQUEST=None, RESPONSE=None):
          """
          Add to the repository
***************
*** 115,119 ****
          path = self.rm_getRelativePath()
          rm.add([path])
!         RESPONSE.redirect(self.absolute_url() + '/rm_versioningForm')
  
      def rm_remove(self, REQUEST=None, RESPONSE=None):
--- 127,132 ----
          path = self.rm_getRelativePath()
          rm.add([path])
!         if RESPONSE:
!             RESPONSE.redirect(self.absolute_url() + '/rm_versioningForm')
  
      def rm_remove(self, REQUEST=None, RESPONSE=None):
***************
*** 176,177 ****
--- 189,201 ----
          if RESPONSE:
              RESPONSE.redirect(self.absolute_url() + '/rm_versioningForm')
+ 
+     def rm_getRevision(self,  REQUEST=None, RESPONSE=None, rev=''):
+         """
+         get a historic reivision
+         """
+         rm = self._rm_getRM()
+         if rm is None:
+             return ''
+         path = self.rm_getRelativePath()
+         return rm.rm_getRevision(REQUEST, RESPONSE, path, rev)
+ 

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/revisionmanager/RevisionObjects/CHANGES.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CHANGES.txt	10 Apr 2004 04:48:14 -0000	1.1
--- CHANGES.txt	12 Apr 2004 16:10:15 -0000	1.2
***************
*** 1,2 ****
--- 1,11 ----
+ v1.2
+ 
+   * add method getRevision to get a history revision(panjunyong)
+ 
+   * add method revert (panjunyong)
+ 
+   * diff can work between any to version now (panjunyong)
+ 
+   * make method callable outside zmi (panjunyong)
  
  v1.1 (2003-05-20)