Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py

Issue 2248653002: Revert of Fix pylint warnings in webkitpy/common/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Manual Revert (Patch Set 1 causes patch failure in read_checksum_from_png_unittest.py) Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py
index 9cbf72fbaa6d3c78183af34f92deccca09e0a38f..87e40538918547a81af5a77c48bb723bf89d7bc9 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py
@@ -31,6 +31,7 @@ import datetime
import logging
import re
+import webkitpy.common.config
from webkitpy.common.checkout.scm.scm import SCM
from webkitpy.common.memoized import memoized
from webkitpy.common.system.executive import Executive, ScriptError
@@ -202,7 +203,7 @@ class Git(SCM):
return self._run_git(['log', '-1', '--grep=' + grep_str, '--date=iso', self.find_checkout_root(path)])
def _commit_position_from_git_log(self, git_log):
- match = re.search(r"^\s*Cr-Commit-Position:.*@\{#(?P<commit_position>\d+)\}", git_log, re.MULTILINE)
+ match = re.search("^\s*Cr-Commit-Position:.*@\{#(?P<commit_position>\d+)\}", git_log, re.MULTILINE)
if not match:
return ""
return int(match.group('commit_position'))
@@ -216,7 +217,7 @@ class Git(SCM):
def timestamp_of_revision(self, path, revision):
git_log = self.most_recent_log_matching(self._commit_position_regex_for_timestamp() % revision, path)
- match = re.search(r"^Date:\s*(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2}) ([+-])(\d{2})(\d{2})$", git_log, re.MULTILINE)
+ match = re.search("^Date:\s*(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2}) ([+-])(\d{2})(\d{2})$", git_log, re.MULTILINE)
if not match:
return ""
@@ -284,7 +285,7 @@ class Git(SCM):
def commit_locally_with_message(self, message):
command = ['commit', '--all', '-F', '-']
- self._run_git(command, input_func=message)
+ self._run_git(command, input=message)
# These methods are git specific and are meant to provide support for the Git oriented workflow
# that Blink is moving towards, hence there are no equivalent methods in the SVN class.
@@ -298,10 +299,10 @@ class Git(SCM):
def git_commits_since(self, commit):
return self._run_git(['log', commit + '..master', '--format=%H', '--reverse']).split()
- def git_commit_detail(self, commit, log_format=None):
+ def git_commit_detail(self, commit, format=None):
args = ['log', '-1', commit]
if format:
- args.append('--format=' + log_format)
+ args.append('--format=' + format)
return self._run_git(args)
def affected_files(self, commit):
@@ -310,7 +311,7 @@ class Git(SCM):
def _branch_tracking_remote_master(self):
origin_info = self._run_git(['remote', 'show', 'origin', '-n'])
- match = re.search(r"^\s*(?P<branch_name>\S+)\s+merges with remote master$", origin_info, re.MULTILINE)
+ match = re.search("^\s*(?P<branch_name>\S+)\s+merges with remote master$", origin_info, re.MULTILINE)
if not match:
raise ScriptError(message="Unable to find local branch tracking origin/master.")
branch = str(match.group("branch_name"))

Powered by Google App Engine
This is Rietveld 408576698