Changeset 503 in tailor for vcpx/cvsps.py

Timestamp:

08/05/05 12:23:23 (8 years ago)

Author:

lele@…

Hash name:

20050805102323-97f81-4de4aa10a473c22b5148200047138b58575375b3

Message:

M-x whitespace-cleanup

File:

• vcpx/cvsps.py (modified) (28 diffs)

vcpx/cvsps.py

@@ -4 +4 @@
 # :Autore:   Lele Gaifax <lele@nautilus.homeip.net>
 # :Licenza:  GNU General Public License
-# 
+#
 
 """
@@ -20 +20 @@
 
 CVS_CMD = 'cvs'
-CVSPS_CMD = 'cvsps'   
+CVSPS_CMD = 'cvsps'
 
 def changesets_from_cvsps(log, sincerev=None):
@@ -30 +30 @@
     from datetime import datetime
     from cvs import compare_cvs_revs
-    
+
     # cvsps output sample:
     ## ---------------------
@@ -140 +140 @@
 
     ## UpdatableSourceWorkingDir
-    
+
     def _getUpstreamChangesets(self, root, repository, module, sincerev=None,
                               branch=None):
@@ -155 +155 @@
         if sincerev:
             sincerev = int(sincerev)
-            
+
         changesets = []
         cmd = [CVSPS_CMD, "--cvs-direct", "-u", "-b", branch,
@@ -161 +161 @@
         cvsps = ExternalCommand(command=cmd)
         log = cvsps.execute(module, stdout=PIPE, TZ='UTC')
-        
+
         for cs in changesets_from_cvsps(log, sincerev):
             changesets.append(cs)
@@ -170 +170 @@
         from os.path import join, exists
         from os import listdir
-        
+
         if not entrydir:
             return
@@ -178 +178 @@
             deldir = changeset.addEntry(entrydir, None)
             deldir.action_kind = deldir.DELETED
-        
+
     def _applyChangeset(self, root, changeset, logger=None):
         from os.path import join, exists, dirname, split
@@ -185 +185 @@
         from cvs import CvsEntries
         from time import sleep
-        
+
         entries = CvsEntries(root)
 
@@ -219 +219 @@
             # remove it with everything it contains (that should be
             # just a single "CVS" subdir, btw)
-            
+
             if e.action_kind == e.DELETED and e.new_revision is None:
                 assert listdir(join(root, e.name)) == ['CVS'], '%s should be empty' % e.name
@@ -229 +229 @@
                 while True:
                     cvsup.execute(e.name, stdout=PIPE)
-            
+
                     if cvsup.exit_status:
                         retry += 1
@@ -243 +243 @@
                     else:
                         break
-                    
+
                 if cvsup.exit_status:
                     raise ChangesetApplicationFailure(
@@ -289 +289 @@
         if timestamp == 'INITIAL':
             timestamp = csets[-1].date.isoformat(sep=' ')
-            
+
         if not exists(join(wdir, 'CVS')):
             cmd = [CVS_CMD, "-q", "-d", repository, "checkout",
@@ -297 +297 @@
             if timestamp:
                 cmd.extend(["-D", "%s UTC" % timestamp])
-            
+
             checkout = ExternalCommand(cwd=basedir, command=cmd)
             checkout.execute(module)
-            
+
             if checkout.exit_status:
                 raise TargetInitializationFailure(
@@ -307 +307 @@
         else:
             if logger: logger.info("Using existing %s", wdir)
-            
+
         self.__forceTagOnEachEntry(wdir)
-        
+
         entries = CvsEntries(wdir)
-        
+
         # update cvsps cache, then loop over the changesets and find the
         # last applied, to find out the actual cvsps revision
@@ -324 +324 @@
                     if not found:
                         break
-                
+
             if found:
                 last = cset
@@ -336 +336 @@
             if logger: logger.info("working copy up to cvsps revision %s",
                                    last.revision)
-            
+
         return last
-    
+
     def _willApplyChangeset(self, root, changeset, applyable=None):
         """
         This gets called just before applying each changeset.
-        
+
         Since CVS has no "createdir" event, we have to take care
         of new directories, creating empty-but-reasonable CVS dirs.
@@ -352 +352 @@
                 if m.action_kind == m.ADDED:
                     self.__createParentCVSDirectories(changeset, root, m.name)
-            
+
             return True
         else:
             return False
-        
+
     def __createParentCVSDirectories(self, changeset, root, entry):
         """
@@ -365 +365 @@
         'cvs update' will work.
         """
-        
+
         from os.path import split, join, exists
         from os import mkdir
@@ -373 +373 @@
             basedir = join(root, path)
         else:
-            basedir = root            
+            basedir = root
         cvsarea = join(basedir, 'CVS')
-        
+
         if path and not exists(cvsarea):
             parentcvs = self.__createParentCVSDirectories(changeset,
@@ -381 +381 @@
 
             assert exists(parentcvs), "Uhm, strange things happen"
-            
+
             if not exists(basedir):
                 mkdir(basedir)
@@ -413 +413 @@
             entry = changeset.addEntry(path, None)
             entry.action_kind = entry.ADDED
-            
+
         return cvsarea
-    
+
     ## SyncronizableTargetWorkingDir
 
@@ -434 +434 @@
         after a manual ``cvs update`` in the working directory.
         """
-        
+
         from os import walk, rename
         from os.path import join
@@ -445 +445 @@
                 f.close()
                 rename(efn, efn+'.old')
-                
+
                 newentries = []
                 for e in entries:
@@ -459 +459 @@
                 f.writelines(newentries)
                 f.close()
-    
+
     def _getCommitEntries(self, changeset):
         """
@@ -472 +472 @@
 
         return entries
-        
+
     def _commit(self,root, date, author, remark, changelog=None, entries=None):
         """
@@ -480 +480 @@
         from shwrap import ReopenableNamedTemporaryFile
         from sys import getdefaultencoding
-        
+
         encoding = ExternalCommand.FORCE_ENCODING or getdefaultencoding()
-        
+
         logmessage = []
         if remark:
@@ -496 +496 @@
         log = open(rontf.name, "w")
         log.write('\n'.join(log))
-        log.close()            
+        log.close()
 
         cmd = [CVS_CMD, "-q", "ci", "-F", rontf.name]
         if not entries:
             entries = ['.']
-          
+
         ExternalCommand(cwd=root, command=cmd).execute(entries)
-       
+
     def _removePathnames(self, root, names):
         """