Changeset 383

Timestamp:

05-03-09 23:12:11 (4 years ago)

Author:

thomas

Message:

patch by: Arek Korbik

• moap/test/test_vcs_bzr.py:
• moap/test/test_vcs_git.py:
• moap/vcs/bzr.py:
• moap/vcs/git.py: Fix for quotes in commit messages. Fixes #280.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap/test/test_vcs_bzr.py (modified) (1 diff)
• moap/test/test_vcs_git.py (modified) (4 diffs)
• moap/vcs/bzr.py (modified) (1 diff)
• moap/vcs/git.py (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2009-03-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        patch by: Arek Korbik
+
+        * moap/test/test_vcs_bzr.py:
+        * moap/test/test_vcs_git.py:
+        * moap/vcs/bzr.py:
+        * moap/vcs/git.py:
+          Fix for quotes in commit messages.
+          Fixes #280.
+
 2009-03-05  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/moap/test/test_vcs_bzr.py

@@ -43 +43 @@
         os.system('rm -rf %s' % checkout)
 
+class TestCommit(BzrTestCase):
+    def testQuotedCommit(self):
+        filename = os.path.join(self.checkout, 'one_line_file.txt')
+        open(filename, 'w').write('This is one line file.\n')
+        cmd = 'bzr add %s' % filename
+        (status, output) = commands.getstatusoutput(cmd)
+        self.failIf(status, "Non-null status %r" % status)
+
+        v = bzr.VCSClass(self.checkout) 
+        self.failUnless(v)
+        v.commit(['one_line_file.txt', ], "I contain quotes like ' and \"")
+
+ 
 class TestTree(BzrTestCase):
     def testBzr(self):

trunk/moap/test/test_vcs_git.py

@@ -16 +16 @@
     def setUp(self):
         self.repository = tempfile.mkdtemp(prefix="moap.test.repo.")
-        oldPath = os.getcwd()
+        self.oldPath = os.getcwd()
         os.chdir(self.repository)
         os.system('git init > /dev/null')
@@ -25 +25 @@
 
         os.system('git add README > /dev/null')
-        os.system('git commit -a -m "readme > /dev/null"')
+        os.system('git commit -a -m "readme" > /dev/null')
 
-        os.chdir(oldPath)
+        os.chdir(self.oldPath)
         self.checkout = tempfile.mkdtemp(prefix="moap.test.checkout.")
         os.rmdir(self.checkout)
@@ -36 +36 @@
         
     def tearDown(self):
+        os.chdir(self.oldPath)
         os.system('rm -rf %s' % self.checkout)
         os.system('rm -rf %s' % self.repository)
@@ -54 +55 @@
         self.failIf(git.detect(checkout))
         os.system('rm -rf %s' % checkout)
+
+class TestCommit(GitTestCase):
+    def testQuotedCommit(self):
+        filename = os.path.join(self.checkout, 'one_line_file.txt')
+        open(filename, 'w').write('This is one line file.\n')
+        os.chdir(self.checkout)
+        cmd = 'git add one_line_file.txt'
+        (status, output) = commands.getstatusoutput(cmd)
+        self.failIf(status, "Non-null status %r, output %r" % (status, output))
+
+        v = git.VCSClass(self.checkout) 
+        self.failUnless(v)
+        v.commit(['one_line_file.txt', ], "I contain quotes like ' and \"")
 
 class TestTree(GitTestCase):

trunk/moap/vcs/bzr.py

@@ -65 +65 @@
             oldPath = os.getcwd()
             os.chdir(self.path)
-            os.system("bzr commit -m \"%s\" %s" % (message, " ".join(paths)))
+            temp = util.writeTemp([message, ])
+            os.system("bzr commit --file %s %s" % (temp, " ".join(paths)))
+            os.unlink(temp)
         finally:
             os.chdir(oldPath)

trunk/moap/vcs/git.py

@@ -82 +82 @@
             if status != 0:
                 raise vcs.VCSException(output)
-            cmd = "git commit -m '%s' %s" % (message, " ".join(paths))
+            temp = util.writeTemp([message, ])
+            cmd = "git commit -F %s %s" % (temp, " ".join(paths))
             self.debug("Running %s" % cmd)
             status, output = commands.getstatusoutput(cmd)
+            os.unlink(temp)
             if status != 0:
                 raise vcs.VCSException(output)