Changeset 444 in tailor

Timestamp:

07/30/05 01:31:57 (8 years ago)

Author:

lele@…

Hash name:

20050729233157-97f81-9f9976446c8d10842d4542094981bd4c5633199d

Message:

M-x whitespace-cleanup

File:

• vcpx/svn.py (modified) (17 diffs)

vcpx/svn.py

@@ -40 +40 @@
             else:
                 return relative
-        
+
         # The path is outside our tracked tree...
         return None
-        
+
     class SvnXMLLogHandler(ContentHandler):
         # Map between svn action and tailor's.
@@ -65 +65 @@
                       'A': ChangesetEntry.ADDED,
                       'D': ChangesetEntry.DELETED}
-        
+
         def __init__(self):
             self.changesets = []
@@ -71 +71 @@
             self.current_field = []
             self.renamed = {}
-            
+
         def startElement(self, name, attributes):
             if name == 'logentry':
@@ -106 +106 @@
                     if e.action_kind == e.ADDED and e.old_name is not None:
                         mv_or_cp[e.old_name] = e
-                
+
                 entries = []
                 for e in self.current['entries']:
@@ -117 +117 @@
                         entries.append(e)
                     else:
-                        entries.append(e)                        
-                
+                        entries.append(e)
+
                 svndate = self.current['date']
                 # 2004-04-16T17:12:48.000000Z
@@ -125 +125 @@
                 ms = int(svndate[20:-1])
                 timestamp = datetime(y, m, d, hh, mm, ss, ms)
-                
+
                 changeset = Changeset(self.current['revision'],
                                       timestamp,
@@ -154 +154 @@
                     self.current['entries'].append(entry)
 
-                    
+
         def characters(self, data):
             self.current_field.append(data)
@@ -162 +162 @@
     # are illegal in an XML stream. This was the case with Twisted Matrix master
     # repository. To be safe, we replace all of them with a question mark.
-    
+
     allbadchars = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0B\x0C\x0E\x0F\x10\x11" \
                   "\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\x7f"
@@ -185 +185 @@
         svnlog = ExternalCommand(cwd=root, command=cmd)
         log = svnlog.execute('.', stdout=PIPE, TZ='UTC')
-        
+
         if svnlog.exit_status:
             return []
@@ -219 +219 @@
             raise ChangesetApplicationFailure(
                 "%s returned status %s" % (str(svnup), svnup.exit_status))
-            
+
         if logger: logger.info("%s updated to %s" % (
             ','.join([e.name for e in changeset.entries]),
             changeset.revision))
-        
+
         result = []
         for line in out:
@@ -229 +229 @@
                 logger.warn("Conflict after 'svn update': '%s'" % line)
                 result.append(line[2:-1])
-            
+
         return result
-        
+
     def _checkoutUpstreamRevision(self, basedir, repository, module, revision,
                                   subdir=None, logger=None, **kwargs):
@@ -237 +237 @@
         Concretely do the checkout of the upstream revision.
         """
-        
+
         from os.path import join, exists
 
@@ -286 +286 @@
 
         last = csets[0]
-        
+
         if logger: logger.info("working copy up to svn revision %s",
                                last.revision)
 
         return last
-    
+
     ## SyncronizableTargetWorkingDir
 
@@ -314 +314 @@
 
         return entries
-        
+
     def _commit(self,root, date, author, remark, changelog=None, entries=None):
         """
@@ -321 +321 @@
 
         from sys import getdefaultencoding
-        
+
         encoding = ExternalCommand.FORCE_ENCODING or getdefaultencoding()
-        
+
         logmessage = []
         if remark:
@@ -334 +334 @@
         # If we cannot use propset, fall back to old behaviour of
         # appending these info to the changelog
-        
+
         if not self.USE_PROPSET:
             logmessage.append('')
@@ -340 +340 @@
             logmessage.append('Date: %s' % date)
             logmessage.append('')
-            
+
         rontf = ReopenableNamedTemporaryFile('svn', 'tailor')
         log = open(rontf.name, "w")
         log.write('\n'.join(logmessage))
-        log.close()            
+        log.close()
 
         cmd = [SVN_CMD, "commit", "--quiet", "--file", rontf.name]
         commit = ExternalCommand(cwd=root, command=cmd)
-        
+
         if not entries:
             entries = ['.']
-            
+
         commit.execute(entries)