Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 359273 - support git stash
Summary: support git stash
Status: RESOLVED FIXED
Alias: None
Product: Orion
Classification: ECD
Component: Git (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 enhancement with 1 vote (vote)
Target Milestone: 7.0   Edit
Assignee: Maciej Bendkowski CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 309355
Blocks:
  Show dependency tree
 
Reported: 2011-09-28 12:46 EDT by Susan McCourt CLA
Modified: 2014-08-11 06:05 EDT (History)
7 users (show)

See Also:


Attachments
Stashes mockup (49.88 KB, image/png)
2014-08-07 15:56 EDT, Anton McConville CLA
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Susan McCourt CLA 2011-09-28 12:46:27 EDT
I have a bunch of experimental work that I want in a branch.
I didn't think of it before I started hacking.
On the command line I would stash my work, create a branch, checkout, pop.

Orion doesn't support stash.
There are alternate workflows to accomplish what I want (which we will document in bug 359271).

But I think stash support is really helpful for users fairly new to git, because many git docs, books, etc. will tell you that stash is the way to get out of this situation.
Comment 1 libing wang CLA 2011-09-28 13:04:39 EDT
Hi ,Tomasz, any insights that we can support this on server side?
Comment 2 Remy Suen CLA 2011-09-28 13:19:27 EDT
Note that stashing support is not in JGit, see bug 309355.

There's something in Gerrit but it's not ready.
http://egit.eclipse.org/r/#change,3790
Comment 3 Tomasz Zarna CLA 2011-09-29 05:18:50 EDT
(In reply to comment #1)
>> Hi ,Tomasz, any insights that we can support this on server side?

> [...] stashing support is not in JGit, see bug 309355.

I'm afraid we can't do much without the support in JGit.
Comment 4 Tomasz Zarna CLA 2011-12-12 07:29:22 EST
This item is in our plan for 0.4[1] but looking at the blocking bug I don't think it's going to make it. Libing are you planing to bring the bug in JGit back to life and provide a patch for the StashCommand? If not I guess we should update the plan and mark this one for 0.5.

[1] http://wiki.eclipse.org/Orion/Plan/0.4
Comment 5 Adrian Aichner CLA 2013-05-09 09:40:38 EDT
This is basically a "metoo".
Is there any news on the status of this feature request?
It would definitely be a big win.
It's about the only functionality I have to shell into my orion server to perform something that should be an IDE feature.

Has the blocking issue changed since?
Comment 6 Tomasz Zarna CLA 2013-05-09 10:00:45 EDT
(In reply to comment #5)
> Has the blocking issue changed since?

The blocking bug in JGit has been fixed. Now it's about either the assignee to pick up the task or someone from the community to provide a patch ;)
Comment 7 Maciej Bendkowski CLA 2014-07-23 04:37:15 EDT
Bartek, please take a look.
Comment 8 Maciej Bendkowski CLA 2014-07-30 11:00:16 EDT
I pulled the server-side changes into a separate feature branch bug359273. Thanks Bartek!
Comment 9 Maciej Bendkowski CLA 2014-07-30 12:06:46 EDT
Pulled the client-side changes into a separate feature branch bug359273 as well.
Comment 10 Maciej Bendkowski CLA 2014-08-04 04:07:06 EDT
Taking over from Bartek.
Comment 11 Maciej Bendkowski CLA 2014-08-07 07:27:00 EDT
Based on Bartek's changes and my own improvements, I finished a basic flavor of git stash and merged it into master:

http://git.eclipse.org/c/orion/org.eclipse.orion.server.git/commit/?id=efc617ba0814cdf61fbd9577e9dc75833baead3c

http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=9e72f69776858dbd8832c1c38f7d022e17670e37
Comment 12 Anton McConville CLA 2014-08-07 15:56:02 EDT
Created attachment 245815 [details]
Stashes mockup

This was the result of our UX Walkthrough review.
Comment 13 Anton McConville CLA 2014-08-07 16:27:02 EDT
I'm really sorry for forgetting to add the mock up last week.
Comment 14 Maciej Bendkowski CLA 2014-08-08 07:53:35 EDT
Reopening to apply changes from Anton's mockup.
Comment 15 Maciej Bendkowski CLA 2014-08-11 06:05:16 EDT
Fixed with:

http://git.eclipse.org/c/orion/org.eclipse.orion.server.git/commit/?id=7582a1a98a895c13f97050abf8d3e4374a501063

http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=3263414b9cf90d70ac2e3370739762370d079ae8

The suggested new UI layout has been applied. I introduced a new git stash pop command as well (see bug 441356). For specific issues with the new look & feel, please open dedicated bugs.