Changeset 233 in tailor

Timestamp:

03/22/05 18:31:53 (8 years ago)

Author:

lele@…

Hash name:

20050322173153-97f81-ec7b53123e3a9635cdea9d363c2920fd8db31d20

Message:

Quote any filename fed to underlying shell process

Location:

vcpx

Files:

• cvsps.py (modified) (5 diffs)
• target.py (modified) (3 diffs)
• darcs.py (modified) (7 diffs)
• svn.py (modified) (6 diffs)
• shwrap.py (modified) (1 diff)

vcpx/cvsps.py

@@ -14 +14 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import SystemCommand
+from shwrap import SystemCommand, shrepr
 from source import UpdatableSourceWorkingDir, ChangesetApplicationFailure, \
      InvocationError
@@ -299 +299 @@
               module=module,
               revision=revision,
-              workingdir=subdir)
+              workingdir=shrepr(subdir))
             if c.exit_status:
                 raise TargetInitializationFailure(
@@ -424 +424 @@
 
         c = CvsAdd(working_dir=root)
-        c(entry=entry)
+        c(entry=shrepr(entry))
 
     def __forceTagOnEachEntry(self, root):
@@ -477 +477 @@
 
         if entries:
-            entries = ' '.join(entries)
+            entries = ' '.join([shrepr(e) for e in entries])
         else:
             entries = '.'
@@ -490 +490 @@
 
         c = CvsRemove(working_dir=root)
-        c(entry=entry)
+        c(entry=shrepr(entry))
 
     def _renameEntry(self, root, oldentry, newentry):

vcpx/target.py

@@ -14 +14 @@
 
 import socket
+from shwrap import shrepr
 
 HOST = socket.getfqdn()
@@ -269 +270 @@
         if subdir<>'.':
             c = addentry(working_dir=root)
-            c(entry=repr(subdir))
+            c(entry=shrepr(subdir))
 
         for dir, subdirs, files in walk(join(root, subdir)):
@@ -283 +284 @@
             if subdirs or files:
                 c = addentry(working_dir=dir)
-                c(entry=' '.join([repr(e) for e in subdirs+files]))
-
+                c(entry=' '.join([shrepr(e) for e in subdirs+files]))
+

vcpx/darcs.py

@@ -12 +12 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import SystemCommand
+from shwrap import SystemCommand, shrepr
 from source import UpdatableSourceWorkingDir, ChangesetApplicationFailure, \
      GetUpstreamChangesetsFailure
@@ -193 +193 @@
         c = SystemCommand(working_dir=root,
                           command="darcs pull --all --patches=%(patch)s")
-        output = c(output=True, patch=repr(changeset.revision))
+        output = c(output=True, patch=shrepr(changeset.revision))
         if c.exit_status:
             raise ChangesetApplicationFailure("'darcs pull' returned status %d saying \"%s\"" % (c.exit_status, output.getvalue().strip()))
@@ -229 +229 @@
             
             output = dpull(output=True, repository=repository,
-                           tag=(revision<>'HEAD' and '--tag=%s'%repr(revision)
+                           tag=(revision<>'HEAD' and
+                                '--tag=%s' % shrepr(revision)
                                 or ''))
             if dpull.exit_status:
@@ -257 +258 @@
                           command="darcs add --case-ok --recursive"
                                   " --quiet %(entry)s")
-        c(entry=' '.join([e.name for e in entries]))
+        c(entry=' '.join([shrepr(e.name) for e in entries]))
         
     def _commit(self,root, date, author, remark, changelog=None, entries=None):
@@ -267 +268 @@
 
         if entries:
-            entries = ' '.join(entries)
+            entries = ' '.join([shrepr(e) for e in entries])
         else:
             entries = '.'
@@ -298 +299 @@
         c = SystemCommand(working_dir=root,
                           command="darcs mv %(old)s %(new)s")
-        c(old=oldentry, new=newentry)
+        c(old=shrepr(oldentry), new=shrepr(newentry))
 
     def _initializeWorkingDir(self, root, repository, module, subdir, addentry=None):
@@ -325 +326 @@
                           command="darcs add --case-ok --recursive"
                           " --quiet %(entry)s")
-        c(entry=subdir)
+        c(entry=shrepr(subdir))

vcpx/svn.py

@@ -12 +12 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import SystemCommand
+from shwrap import SystemCommand, shrepr
 from source import UpdatableSourceWorkingDir, \
      ChangesetApplicationFailure, GetUpstreamChangesetsFailure
@@ -310 +310 @@
             svnco = SvnCheckout(working_dir=basedir)
             svnco(output=True, repository=repository, module=module,
-                  wc=subdir, revision=revision)
+                  wc=shrepr(subdir), revision=revision)
             if svnco.exit_status:
                 raise TargetInitializationFailure(
@@ -339 +339 @@
 
         c = SvnAdd(working_dir=root)
-        c(entry=' '.join([e.name for e in entries]))
+        c(entry=' '.join([shrepr(e.name) for e in entries]))
 
     def _commit(self,root, date, author, remark, changelog=None, entries=None):
@@ -354 +354 @@
             
         if entries:
-            entries = ' '.join(entries)
+            entries = ' '.join([shrepr(e) for e in entries])
         else:
             entries = '.'
@@ -366 +366 @@
 
         c = SvnRemove(working_dir=root)
-        c(entry=' '.join([e.name for e in entries]))
+        c(entry=' '.join([shrepr(e.name) for e in entries]))
 
     def _renameEntry(self, root, oldentry, newentry):
@@ -374 +374 @@
 
         c = SvnMv(working_dir=root)
-        c(old=oldentry, new=newentry)
+        c(old=shrepr(oldentry), new=repr(newentry))
 
     def _initializeWorkingDir(self, root, repository, module, subdir, addentry=None):

vcpx/shwrap.py

@@ -9 +9 @@
 from StringIO import StringIO
 from sys import stderr
+
+def shrepr(str):
+    str = str.replace("'", "\\'")
+    return "'" + str + "'"
 
 class VerboseStringIO(StringIO):