Changeset 448 in tailor

Timestamp:

07/30/05 02:20:10 (8 years ago)

Author:

lele@…

Hash name:

20050730002010-97f81-9b093a9d05e23d67767aa14c0ec4b8ebf302a9a8

Message:

M-x whitespace-cleanup

File:

• vcpx/darcs.py (modified) (24 diffs)

vcpx/darcs.py

@@ -4 +4 @@
 # :Autore:   Lele Gaifax <lele@nautilus.homeip.net>
 # :Licenza:  GNU General Public License
-# 
+#
 
 """
@@ -31 +31 @@
     Return a list of ``Changeset`` instances.
     """
-    
+
     from xml.sax import parse
     from xml.sax.handler import ContentHandler
@@ -48 +48 @@
             else:
                 self.darcsdiff = None
-                
+
         def startElement(self, name, attributes):
             if name == 'patch':
@@ -82 +82 @@
                                  self.current['comment'],
                                  self.current['entries'])
-                
+
                 if self.darcsdiff:
                     cset.unidiff = self.darcsdiff.execute(
                         stdout=PIPE, patchname=cset.revision).read()
-                    
+
                 self.changesets.append(cset)
                 self.current = None
@@ -115 +115 @@
     parse(changes, handler)
     changesets = handler.changesets
-    
+
     # sort changeset by date
     changesets.sort(lambda x, y: cmp(x.date, y.date))
@@ -121 +121 @@
     return changesets
 
-    
+
 class DarcsWorkingDir(UpdatableSourceWorkingDir,SyncronizableTargetWorkingDir):
     """
@@ -128 +128 @@
 
     ## UpdatableSourceWorkingDir
-    
+
     def getUpstreamChangesets(self, root, repository, module, sincerev=None):
         """
@@ -137 +137 @@
         from time import strptime
         from changes import Changeset
-        
+
         cmd = [DARCS_CMD, "pull", "--dry-run"]
         pull = ExternalCommand(cwd=root, command=cmd)
         output = pull.execute(repository, stdout=PIPE, stderr=STDOUT, TZ='UTC')
-        
+
         if pull.exit_status:
             raise GetUpstreamChangesetsFailure(
@@ -191 +191 @@
 
         return changesets
-    
+
     def _applyChangeset(self, root, changeset, logger=None):
         """
@@ -198 +198 @@
 
         from re import escape
-        
+
         if changeset.revision.startswith('tagged '):
             selector = '--tags'
@@ -205 +205 @@
             selector = '--patches'
             revtag = escape(changeset.revision)
-            
+
         cmd = [DARCS_CMD, "pull", "--all", selector, revtag]
         pull = ExternalCommand(cwd=root, command=cmd)
         output = pull.execute(stdout=PIPE, stderr=STDOUT)
-        
+
         if pull.exit_status:
             raise ChangesetApplicationFailure(
@@ -232 +232 @@
         from os import mkdir
         from re import escape
-        
+
         if revision == 'INITIAL':
             initial = True
@@ -271 +271 @@
                 dpull = ExternalCommand(cwd=wdir, command=cmd)
                 output = dpull.execute(repository, stdout=PIPE, stderr=STDOUT)
-                        
+
                 if dpull.exit_status:
                     raise TargetInitializationFailure(
@@ -284 +284 @@
             output = dget.execute(repository, subdir,
                                   stdout=PIPE, stderr=STDOUT)
-            
+
             if dget.exit_status:
                 raise TargetInitializationFailure(
@@ -293 +293 @@
         changes = ExternalCommand(cwd=wdir, command=cmd)
         output = changes.execute(stdout=PIPE, stderr=STDOUT)
-        
+
         if changes.exit_status:
             raise ChangesetApplicationFailure(
                 "%s returned status %d saying \"%s\"" %
                 (str(changes), changes.exit_status, output.read()))
-        
+
         last = changesets_from_darcschanges(output)
-        
+
         return last[0]
 
-    
+
     ## SyncronizableTargetWorkingDir
-   
+
     def _addPathnames(self, root, names):
         """
@@ -313 +313 @@
         cmd = [DARCS_CMD, "add", "--case-ok", "--not-recursive", "--quiet"]
         ExternalCommand(cwd=root, command=cmd).execute(names)
-        
+
     def _addSubtree(self, root, subdir):
         """
@@ -321 +321 @@
         cmd = [DARCS_CMD, "add", "--case-ok", "--recursive", "--quiet"]
         ExternalCommand(cwd=root, command=cmd).execute(subdir)
-        
+
     def _commit(self, root, date, author, remark, changelog=None, entries=None):
         """
@@ -328 +328 @@
 
         from sys import getdefaultencoding
-        
+
         encoding = ExternalCommand.FORCE_ENCODING or getdefaultencoding()
 
@@ -342 +342 @@
         if not entries:
             entries = ['.']
-            
+
         record = ExternalCommand(cwd=root, command=cmd)
         record.execute(entries, input='\n'.join(logmessage), stdout=PIPE)
-        
+
         if record.exit_status:
             raise ChangesetApplicationFailure(
                 "%s returned status %d" % (str(record), record.exit_status))
-        
+
     def _removePathnames(self, root, names):
         """
@@ -357 +357 @@
         # Since the source VCS already deleted the entry, and given that
         # darcs will do the right thing with it, do nothing here, instead
-        # of 
+        # of
         #         c = ExternalCommand(cwd=root,
         #                             command=[DARCS_CMD, "remove"])
@@ -364 +364 @@
 
         pass
-    
+
     def _renamePathname(self, root, oldname, newname):
         """
@@ -372 +372 @@
         from os.path import join, exists
         from os import rename
-        
+
         # Check to see if the oldentry is still there. If it does,
         # that probably means one thing: it's been moved and then
@@ -416 +416 @@
         ignored = [line for line in boring if line <> '\.cvsignore$\n']
         boring.close()
-        
+
         # Augment the boring file, that contains a regexp per line
         # with all known VCs metadirs to be skipped.
@@ -425 +425 @@
         boring.write('\n^tailor.log$\n^tailor.info$\n')
         boring.close()
-        
+
         SyncronizableTargetWorkingDir._initializeWorkingDir(self, root,
                                                             repository, module,