[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hamaji at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 67e00e45d8f7895e83f394b9d79c304739d5ebfc
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 06:02:09 2009 +0000

    2009-11-15  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Eric Seidel.
    
            svn-apply may not handle git patches created by bugzilla-tool
            https://bugs.webkit.org/show_bug.cgi?id=31457
    
            * Scripts/modules/scm.py:
            * Scripts/modules/scm_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51010 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 143ffc4..fa53c9e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Eric Seidel.
 
+        svn-apply may not handle git patches created by bugzilla-tool
+        https://bugs.webkit.org/show_bug.cgi?id=31457
+
+        * Scripts/modules/scm.py:
+        * Scripts/modules/scm_unittest.py:
+
+2009-11-15  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Eric Seidel.
+
         bugzilla-tool should post git binary diff
         https://bugs.webkit.org/show_bug.cgi?id=31458
 
diff --git a/WebKitTools/Scripts/modules/scm.py b/WebKitTools/Scripts/modules/scm.py
index a9bd0dd..629e010 100644
--- a/WebKitTools/Scripts/modules/scm.py
+++ b/WebKitTools/Scripts/modules/scm.py
@@ -131,7 +131,7 @@ class SCM:
             stdin = subprocess.PIPE if input else None
             string_to_communicate = input
         process = subprocess.Popen(args, stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=cwd)
-        output = process.communicate(string_to_communicate)[0].rstrip()
+        output = process.communicate(string_to_communicate)[0]
         exit_code = process.wait()
         if exit_code:
             script_error = ScriptError(script_args=args, exit_code=exit_code, output=output, cwd=cwd)
@@ -297,7 +297,7 @@ class SVN(SCM):
     @classmethod
     def value_from_svn_info(cls, path, field_name):
         svn_info_args = ['svn', 'info', path]
-        info_output = cls.run_command(svn_info_args)
+        info_output = cls.run_command(svn_info_args).rstrip()
         match = re.search("^%s: (?P<value>.+)$" % field_name, info_output, re.MULTILINE)
         if not match:
             raise ScriptError(script_args=svn_info_args, message='svn info did not contain a %s.' % field_name)
@@ -396,7 +396,7 @@ class Git(SCM):
 
     @classmethod
     def in_working_directory(cls, path):
-        return cls.run_command(['git', 'rev-parse', '--is-inside-work-tree'], cwd=path, error_handler=ignore_error) == "true"
+        return cls.run_command(['git', 'rev-parse', '--is-inside-work-tree'], cwd=path, error_handler=ignore_error).rstrip() == "true"
 
     @classmethod
     def find_checkout_root(cls, path):
@@ -457,7 +457,7 @@ class Git(SCM):
     @classmethod
     def git_commit_from_svn_revision(cls, revision):
         # git svn find-rev always exits 0, even when the revision is not found.
-        return cls.run_command(['git', 'svn', 'find-rev', 'r%s' % revision])
+        return cls.run_command(['git', 'svn', 'find-rev', 'r%s' % revision]).rstrip()
 
     def diff_for_revision(self, revision):
         git_commit = self.git_commit_from_svn_revision(revision)
diff --git a/WebKitTools/Scripts/modules/scm_unittest.py b/WebKitTools/Scripts/modules/scm_unittest.py
index 0cac037..25d96c2 100644
--- a/WebKitTools/Scripts/modules/scm_unittest.py
+++ b/WebKitTools/Scripts/modules/scm_unittest.py
@@ -126,10 +126,10 @@ class SCMClassTests(unittest.TestCase):
 
     def test_run_command_with_pipe(self):
         input_process = subprocess.Popen(['/bin/echo', 'foo\nbar'], stdout=subprocess.PIPE, stderr=self.dev_null)
-        self.assertEqual(SCM.run_command(['/usr/bin/grep', 'bar'], input=input_process.stdout), "bar")
+        self.assertEqual(SCM.run_command(['/usr/bin/grep', 'bar'], input=input_process.stdout), "bar\n")
 
         # Test the non-pipe case too:
-        self.assertEqual(SCM.run_command(['/usr/bin/grep', 'bar'], input="foo\nbar"), "bar")
+        self.assertEqual(SCM.run_command(['/usr/bin/grep', 'bar'], input="foo\nbar"), "bar\n")
 
         command_returns_non_zero = ['/bin/sh', '--invalid-option']
         # Test when the input pipe process fails.

-- 
WebKit Debian packaging