Comment 1 Simon Kaegi 2011-07-07 09:30:34 EDT

For good or bad I found I was using this for reviews a fair bit.

Comment 2 Susan McCourt 2012-01-20 18:43:11 EST

This is becoming important now that we have more contributors coming on board. Folks tend to work in github until they are ready to contribute.  And perhaps committing along the way.  But when they are ready to submit a fix, we just want one commit we can cherrypick.  I noticed that some folks (Andy from VMWare) are squashing before they contribute, it would be nice to be able to do the squash from Orion.  Then they could do their complete workflow in Orion.

Comment 3 Szymon Brandys 2012-01-23 04:23:53 EST

We are blocked by JGit. Tomek, when you are back, could you check what JGit plans are in this area?

Comment 4 Tomasz Zarna 2012-04-04 03:44:18 EDT

There is a change adding the option with pending review[1]. I pinged Christian, who commented earlier on that change, two days ago. No response yet.

[1] https://git.eclipse.org/r/#/c/4995/

Comment 5 Tomasz Zarna 2012-04-30 07:16:36 EDT

Neither --squash [1] nor --no-commit [2] switch is in JGit's master. Thus it's unlikely Orion is going to have any of those in .5M2. I'm setting the target milestone to optimistic .5.

[1] https://git.eclipse.org/r/#/c/4995/
[2] https://git.eclipse.org/r/#/c/4945/

Comment 6 Edyta Przymus 2012-06-28 14:11:46 EDT

My solution for this:

Client part: https://github.com/edytaprzymus/orion.client/commit/4c6de649bf810bea903d123a7b31f19454adb961

Server part:
https://github.com/edytaprzymus/orion.server/commit/99d71e0c8a5da833109556f365ee7e910258b6c6

Comment 7 Edyta Przymus 2012-07-01 11:45:24 EDT

Sorry everyone, I committed changes about server part too fast, this is the correct version:

https://github.com/edytaprzymus/orion.server/commit/2ea526e47fd8c9a402000f43640b194c6e519079

However, to run it I had to download the latest JGit build and import it to eclipse and change the dependency saved in Server Sources. This changes are not committed. Please consider it while running this code.

Comment 8 Szymon Brandys 2012-07-02 10:39:52 EDT

Go to Repositories/[repo]/Branches and try to merge squash there. I get:
ReferenceError: refreshStatusCallBack is not defined
http://localhost:8080/orion/git/gitCommands.js
Line 1129
Moreover I see no tooltip for the new command, we need to request a separate icon for 'merge squash' and tests are missing.

Comment 9 Edyta Przymus 2012-07-03 17:31:49 EDT

Test still missing, but this commit should work fine

https://github.com/edytaprzymus/orion.client/commit/e90d456619f4e0dc4d283b6498fda95e0e825a78

Comment 10 Szymon Brandys 2012-07-04 05:56:16 EDT

Works fine. Please attach tests.

Comment 11 Edyta Przymus 2012-07-08 14:07:44 EDT

https://github.com/edytaprzymus/orion.server/commit/745769c235bff124701ed86c0ded64ebd9b11e85

Test added

Comment 12 Szymon Brandys 2012-07-10 07:10:51 EDT

https://github.com/edytaprzymus/orion.client/commit/9706f07ab5c9a3276c1d9a734152eb446c67b46a merged to master on eclipse.org.

Comment 13 Edyta Przymus 2012-07-10 08:34:21 EDT

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

Comment 14 Szymon Brandys 2012-07-10 09:45:06 EDT

https://github.com/edytaprzymus/orion.server/commit/0c85163ce7139ae7a150efea4a231c08ad86764f merged to master on eclipse.org.
Thanks Edyta. Marking FIXED.

Comment 15 Lothar Werzinger 2012-08-23 17:23:48 EDT

(In reply to comment #14)
> Marking FIXED.

When will this feature be available via the EGit update site?

Comment 16 Tomasz Zarna 2012-08-24 08:33:44 EDT

(In reply to comment #15)
> When will this feature be available via the EGit update site?

The feature will be added to EGit with bug 382720.