Bug 133168

Summary:

Add cherrypick_merge and revert methods to SCM

Product:

WebKit

Reporter:

Matthew Hanson <matthew_hanson>

Component:

Tools / Tests

Assignee:

Nobody <webkit-unassigned>

Status:

NEW ---

Severity:

Enhancement

CC:

dpranke, glenn, ossy, rniwa

Priority:

Version:

528+ (Nightly build)

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
Add cherrypick_merge and revert_file to SCM and subclasses.	ossy: review-

Description Matthew Hanson 2014-05-21 21:44:53 PDT

SCM is missing methods for cherrypicking a specific commit and reverting a single file. These methods should be added to the base class and implemented in the SVN and Git subclasses.

Comment 1 Matthew Hanson 2014-05-21 22:13:27 PDT

Created attachment 231856 [details]
Add cherrypick_merge and revert_file to SCM and subclasses.

Comment 2 Ryosuke Niwa 2014-05-21 22:21:16 PDT

Comment on attachment 231856 [details]
Add cherrypick_merge and revert_file to SCM and subclasses.

I'd prefer if all these changes to webkitpy were in the patch that adds some scripts to use it.

Comment 3 Ryosuke Niwa 2014-05-21 22:48:45 PDT

Comment on attachment 231856 [details]
Add cherrypick_merge and revert_file to SCM and subclasses.

rs=me.

Comment 4 Csaba Osztrogonác 2015-02-26 06:15:27 PST

Cherry pick is already added by http://trac.webkit.org/changeset/175606 ... but it isn't used at all. What is the goal with adding unused codes to git.py?

Comment 5 Csaba Osztrogonác 2015-02-26 06:15:50 PST

Comment on attachment 231856 [details]
Add cherrypick_merge and revert_file to SCM and subclasses.

r-, because they are unused functions.

Comment 6 Ryosuke Niwa 2015-02-26 09:40:02 PST

(In reply to comment #5)
> Comment on attachment 231856 [details]
> Add cherrypick_merge and revert_file to SCM and subclasses.
> 
> r-, because they are unused functions.

These are used by Apple internal tools.