Bug 133168 - Add cherrypick_merge and revert methods to SCM
Summary: Add cherrypick_merge and revert methods to SCM
Status: NEW
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Enhancement
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-21 21:44 PDT by Matthew Hanson
Modified: 2015-02-26 09:40 PST (History)
4 users (show)

See Also:

Attachments
Add cherrypick_merge and revert_file to SCM and subclasses. (4.17 KB, patch)
2014-05-21 22:13 PDT, Matthew Hanson 		ossy: review-
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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.