| Summary: | support git stash | ||||||
|---|---|---|---|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | Susan McCourt <susan> | ||||
| Component: | Git | Assignee: | Maciej Bendkowski <maciej.bendkowski> | ||||
| Status: | RESOLVED FIXED | QA Contact: | |||||
| Severity: | enhancement | ||||||
| Priority: | P3 | CC: | adrian.aichner, antonm, kopczuk, libingw, maciej.bendkowski, remy.suen, tomasz.zarna | ||||
| Version: | unspecified | ||||||
| Target Milestone: | 7.0 | ||||||
| Hardware: | PC | ||||||
| OS: | Windows 7 | ||||||
| See Also: | https://bugs.eclipse.org/bugs/show_bug.cgi?id=441356 | ||||||
| Whiteboard: | |||||||
| Bug Depends on: | 309355 | ||||||
| Bug Blocks: | |||||||
| Attachments: |
|
||||||
|
Description
Susan McCourt
Hi ,Tomasz, any insights that we can support this on server side? 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 (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. 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 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? (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 ;) Bartek, please take a look. I pulled the server-side changes into a separate feature branch bug359273. Thanks Bartek! Pulled the client-side changes into a separate feature branch bug359273 as well. Taking over from Bartek. 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 Created attachment 245815 [details]
Stashes mockup
This was the result of our UX Walkthrough review.
I'm really sorry for forgetting to add the mock up last week. Reopening to apply changes from Anton's mockup. 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. |