| 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 7f4985bbe9717da8111dfefcdbae208ec79019a2..c4d4abf11437e8b259bb227905a5f87e27b88283 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
|
| @@ -200,7 +200,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("^\s*Cr-Commit-Position:.*@\{#(?P<commit_position>\d+)\}", git_log, re.MULTILINE)
|
| + match = re.search(r"^\s*Cr-Commit-Position:.*@\{#(?P<commit_position>\d+)\}", git_log, re.MULTILINE)
|
| if not match:
|
| return ""
|
| return int(match.group('commit_position'))
|
| @@ -214,7 +214,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("^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(r"^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 ""
|
|
|
| @@ -308,7 +308,7 @@ class Git(SCM):
|
|
|
| def _branch_tracking_remote_master(self):
|
| origin_info = self._run_git(['remote', 'show', 'origin', '-n'])
|
| - match = re.search("^\s*(?P<branch_name>\S+)\s+merges with remote master$", origin_info, re.MULTILINE)
|
| + match = re.search(r"^\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"))
|
|
|