Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Provide pull request link when syncing web-platform-tests with upstream.

Browse source
This commit is contained in:
Josh Matthews 2017-03-29 16:03:56 -04:00
parent b6bc49225e
commit 4a0e24b56f
2 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tests/wpt/update/tree.py
View file

@ -2,7 +2,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from distutils.spawn import find_executable
import re
import subprocess
import sys
import tempfile
from wptrunner import update as wptupdate
@ -57,7 +60,7 @@ class GitTree(wptupdate.tree.GitTree):
:base_param commit: Commit object for the base commit from which to log
:param path: Path that the commits must touch
"""
args = ["--pretty=format:%H", "--reverse", "-z"]
args = ["--pretty=format:%H", "--reverse", "-z", "--no-merges"]
if base_commit is not None:
args.append("%s.." % base_commit.sha1)
if path is not None:
@ -115,9 +118,10 @@ class GitTree(wptupdate.tree.GitTree):
return get_unique_name(branches, prefix)
class Patch(object):
def __init__(self, author, email, message, diff):
def __init__(self, author, email, message, merge_message, diff):
self.author = author
self.email = email
self.merge_message = merge_message
if isinstance(message, CommitMessage):
self.message = message
else:
@ -147,6 +151,7 @@ class GeckoCommitMessage(CommitMessage):
_bug_re = re.compile("^Bug (\d+)[^\w]*(?:Part \d+[^\w]*)?(.*?)\s*(?:r=(\w*))?$",
re.IGNORECASE)
_merge_re = re.compile("^Auto merge of #(\d+) - [^:]+:[^,]+, r=(.+)$", re.IGNORECASE)
_backout_re = re.compile("^(?:Back(?:ing|ed)\s+out)|Backout|(?:Revert|(?:ed|ing))",
re.IGNORECASE)
@ -160,16 +165,35 @@ class GeckoCommitMessage(CommitMessage):
else:
self.backouts = []
m = self._bug_re.match(self.full_summary)
m = self._merge_re.match(self.full_summary)
if m is not None:
self.bug, self.summary, self.reviewer = m.groups()
self.bug, self.reviewer = m.groups()
self.summary = self.full_summary
else:
self.bug, self.summary, self.reviewer = None, self.full_summary, None
m = self._bug_re.match(self.full_summary)
if m is not None:
self.bug, self.summary, self.reviewer = m.groups()
else:
self.bug, self.summary, self.reviewer = None, self.full_summary, None
class GeckoCommit(Commit):
msg_cls = GeckoCommitMessage
def __init__(self, tree, sha1, is_merge=False):
Commit.__init__(self, tree, sha1)
if not is_merge:
args = ["-c", sha1]
try:
merge_rev = self.git("when-merged", *args).strip()
except subprocess.CalledProcessError as exn:
if not find_executable('git-when-merged'):
print('Please add the `when-merged` git command to your PATH ' +
'(https://github.com/mhagger/git-when-merged/).')
sys.exit(1)
raise exn
self.merge = GeckoCommit(tree, merge_rev, True)
def export_patch(self, path=None):
"""Convert a commit in the tree to a Patch with the bug number and
reviewer stripped from the message"""
@ -180,5 +204,6 @@ class GeckoCommit(Commit):
diff = self.git("show", *args)
return Patch(self.author, self.email, self.message, diff)
merge_message = self.merge.message if self.merge else None
return Patch(self.author, self.email, self.message, merge_message, diff)