Changeset 214067 in webkit

Timestamp:

Mar 16, 2017 1:55:20 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Fix quotes around --pretty format git flag.
​https://bugs.webkit.org/show_bug.cgi?id=169712

Patch by Kocsen Chung <Kocsen Chung> on 2017-03-16
Reviewed by Ryosuke Niwa.

Remove double quotes from command list element '--pretty="format:%ct"' since it will cause
subprocess to not work as expected.
Additionally, take advantage of git -C flag.

• Scripts/webkitpy/common/checkout/scm/git.py:

(Git.native_revision):
Take advantage of git -C flag.
(Git.timestamp_of_native_revision):
Take advantage of git -C flag and remove double quotes from git formatter.
We know this works from committer_email_for_revision() function.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/git.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-03-16  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Fix quotes around --pretty format git flag.
+        https://bugs.webkit.org/show_bug.cgi?id=169712
+
+        Reviewed by Ryosuke Niwa.
+
+        Remove double quotes from command list element '--pretty="format:%ct"' since it will cause
+        subprocess to not work as expected.
+        Additionally, take advantage of `git -C` flag.
+
+        * Scripts/webkitpy/common/checkout/scm/git.py:
+        (Git.native_revision):
+        Take advantage of `git -C` flag.
+        (Git.timestamp_of_native_revision):
+        Take advantage of `git -C` flag and remove double quotes from git formatter.
+        We know this works from `committer_email_for_revision()` function.
+
 2017-03-16  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py

@@ -290 +290 @@
 
     def native_revision(self, path):
-        return self._run_git(['log', '-1', '--pretty=format:%H', self.find_checkout_root(path)])
+        return self._run_git(['-C', self.find_checkout_root(path), 'log', '-1', '--pretty=format:%H'])
 
     def svn_url(self):
@@ -316 +316 @@
 
     def timestamp_of_native_revision(self, path, sha):
-        unix_timestamp = self._run_git(['log', '-1', sha, '--pretty="format:%ct"', self.find_checkout_root(path)]).rstrip()
+        unix_timestamp = self._run_git(['-C', self.find_checkout_root(path), 'log', '-1', sha, '--pretty=format:%ct']).rstrip()
         commit_timestamp = datetime.datetime.utcfromtimestamp(float(unix_timestamp))
         return commit_timestamp.strftime('%Y-%m-%dT%H:%M:%SZ')