Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stash support #431

Closed
wants to merge 23 commits into from
Closed

Stash support #431

wants to merge 23 commits into from

Conversation

tiennou
Copy link

@tiennou tiennou commented Feb 13, 2015

This is a rebase of #239 on top of #301. It might be possible to have it against master if you prefer, but I felt compelled to force your hand a little ;-).

Notes :

  • I rewrote commits on the fly while rebasing (because of the XIBs and conflicts) so some of the originals are slightly changed (eg. 73cf163 switched to using the Objective-Git wrapper directly).
  • Objective-Git still lacks support for stash pop, so I didn't switch it away from the CLI at all. I might go do some C for this ;-).

tiennou and others added 11 commits February 13, 2015 18:22
As Objective-Git doesn't yet offer stash support use libgit2 right away. should be replaced by Objective-Git equivalent when available
add menu items for stash items: "Pop stash@..", "Apply", "View Diff" and "Drop"
but only "View Diff" functional yet
Note: use of deprecated [PBGitRepository outputInWorkdirForArguments:…] should be replaced with objective-git equivalent once stash-support is available.
@tiennou
Copy link
Author

tiennou commented Feb 13, 2015

Oh yeah, fixes #14, #424.

muhqu and others added 11 commits February 13, 2015 22:32
Therefore the old controls, e.g. "Amend" checkbox, "Sign-off" and "Commit" buttons, have been moved into a tab-less NSTabView. The tab switches to the stash controls when holding the Alt-Key down.
Note: use of deprecated [PBGitRepository outputInWorkdirForArguments:…] should be replaced with objective-git equivalent once stash-support is available.
- added IBOutlet for stashButton
- added a trackedFilesController to easily get a count of tracked files
- "Stash Save ⌘Y"
- "Stash Save - Keep Index ⌥⌘Y" (alternate)
- "Stash Pop ⇧⌘Y"
@tiennou
Copy link
Author

tiennou commented Feb 13, 2015

Looks like the C part is cooking in in libgit2/libgit2#2705.

@jakirkham
Copy link

+1

Better stash support would be amazing.

@rad182
Copy link

rad182 commented Nov 5, 2015

why hasn't this merged yet?:(

@eapen
Copy link

eapen commented May 16, 2016

👍

@tiennou tiennou closed this Dec 9, 2016
@tiennou tiennou deleted the stash-support branch December 9, 2016 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants