Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 349727

Summary:	[client] git cherry-pick support UI
Product:	[ECD] Orion	Reporter:	libing wang <libingw>
Component:	Git	Assignee:	Szymon Brandys <Szymon.Brandys>
Status:	RESOLVED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	bokowski, janikpiotrek, john.arthorne, Szymon.Brandys, tomasz.zarna
Version:	0.2
Target Milestone:	0.3 M1
Hardware:	PC
OS:	Windows 7
Whiteboard:
Bug Depends on:	351715, 353088
Bug Blocks:	351458, 353572

Description libing wang

2011-06-17 15:51:16 EDT

When I reviewed code togethere with Boris today , I had to pick up a specific commit using something like git cherry-pick 05371af065df56947b963d444cbd821f1569bb55

It will be nice if we can have this in Orion.

Comment 1 libing wang

2011-06-20 13:19:33 EDT

Another case here we should consider as well:
I had that branch in the remote now.
I planned to cherry pick it up later this week after we decide the code in that branch has to be pushed to master.
But today I fixed another bug which will conflict .
So cherry-pick should cover this as well.

Comment 2 Piotr Janik

2011-07-28 10:31:42 EDT

https://github.com/pjanik/orion.client/tree/bug349727

I wrote all this code and have the rights to contribute it to Eclipse under the
eclipse.org web site terms of use.

Comment 3 Szymon Brandys

2011-08-02 07:34:33 EDT

cherry pick on the remote view does not work. I get:

ReferenceError: gitService is not defined
gitService.getLog(jsonDa...n(scopedCommitsJsonData, secondArd) { 

when I fix the wrong reference, I get:

HTTP status code: 200
gitClient.js (line 788)
ReferenceError: remoteNavigator is not defined
remoteNavigator.rendere...comingCommits(scopedCommitsJsonData); 

Moreover we always get OK status after cherry pick, even if the chosen commit was already cherry-picked. We might handle it by checking if HEAD was moved during the operation.

Comment 4 Szymon Brandys

2011-08-02 08:56:47 EDT

The fix did not work well for the remote view what was quite important. I fixed that and I'm raising a new bug for "chosen commit was already cherry-picked" issue (bug 353572).

http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=5954e4f7efe6dc1dde13758dc5a1d8987dd59918