Gitx dev stashes by muhqu · Pull Request #239 · rowanj/gitx

muhqu · 2013-08-07T19:49:27Z

Support for stashes (see #14 )

Major Tasks:

list stashes in sidebar (with libgit2)
pop stash (context menu)
apply stash (context menu)
drop stash (context menu)
view diff (context menu, open in new window)
stash save via commit dialog (Hold down ⌥-key in commit dialog to reveal 'Stash Changes' button and 'Keep Index' checkbox.)
app menu items:
- "Stash Save ⌘Y"
- "Stash Save - Keep Index ⌥⌘Y" (alternate)
- "Stash Pop ⇧⌘Y"
display an error message when "stash save/pop/apply" result in error

Optional Todos:

implement "stash save/pop/apply" via objective-git or libgit2

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.

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

schmurfy · 2013-08-08T07:46:34Z

it looks great !

- "Stash Save ⌘Y" - "Stash Save - Keep Index ⌥⌘Y" (alternate) - "Stash Pop ⇧⌘Y"

schmurfy · 2013-08-14T07:43:37Z

I can test it out see if it works fine for me if you want, I will need a binary thought.
on the todo I think the error message is a really important thing to have, based on my own workflow half of the time applying a stash result in a conflict, most of the time a minor one but still I prefer to know it ^^

For me the main use of the stashes list in GitX would be to see what I have in store more than acting on it via GitX, I still do most of my actions in a console.

kieran · 2013-08-15T15:09:46Z

👍

emptyflask · 2013-08-21T20:22:08Z

Well I don't know ObjC and I haven't tested this patch, but I want this feature, so 👍

muhqu · 2013-08-21T20:24:24Z

Classes/git/PBGitRepository.m

@rowanj I know showErrorSheet... is deprecated, but what's the proposed alternative?

muhqu · 2013-08-21T20:40:57Z

@schmurfy and anyone else who wants to test this PR without having to build it them self here's a link to a binary build by myself: http://muhqu.de/builds/GitX-dev-stashes@5d8e03cafe.zip

muhqu · 2013-08-21T20:48:46Z

Btw, I'm not sure what might be the best keyboard shortcuts for the menu items... I choose ⌘Y mostly because I feel "stash" in git it a bit like "yank" in vi, if you know what I mean. But If you guys have other ideas just let me know!

emptyflask · 2013-08-21T21:54:30Z

@muhqu thanks for that. It seems to work well...

kieran · 2013-08-21T21:59:57Z

Seems good here as well! 💯

schmurfy · 2013-08-22T07:46:02Z

since we can rebind any shortcut anyway thanks to mac os x I don't think the default one is that important.

schmurfy · 2013-08-22T07:47:38Z

it seems to work well for me too (I am on 10.8.4)

rowanj · 2013-08-23T01:34:37Z

@muhqu I mostly deprecated the error sheet because it was really buggy after the ARC conversion; that should be fixed now. I think I never got around to un-deprecating it because it's not a particularly good UX design, but it's fine to use for now.

mengelbrecht · 2013-08-29T19:56:40Z

Is there an ETA for this pull request to get merged? Stash support directly in GitX would greatly improve my workflow.

schmurfy · 2013-08-30T07:15:28Z

same, and as far as I can tell the binary posted works fine.

kieran · 2013-09-19T19:54:12Z

Would love to have this in the main build ;-)

muhqu · 2013-09-19T19:58:49Z

👍 me too.. ;-) version bump! ...version bump! ...version bump! ;-P

muhqu · 2013-09-19T20:02:47Z

Btw, eventhough I have this in my build, I don't get much used to it. I'm still using DTerm for stash / stash pop stuff...

kieran · 2013-09-19T20:48:14Z

I currently keep a Laullon build around for stashing & popping. I find it incredibly handy to browse the stashed diffs since I'm constantly switching contexts for hotfixes.

Thanks for this PR! Looking forward to only having one version :-)

…n on master

Missing `[super init]`

rowanj · 2013-09-20T14:06:28Z

n.b. the merged branch (issues/239) is currently missing a few XIB changes that conflicted

aoxborrow · 2013-10-09T18:58:40Z

this will be handy. 👏

pvinis · 2014-11-11T11:24:19Z

any news about this issue?

muhqu · 2014-11-11T13:25:42Z

@pvinis looks like I need to rebase this feature branch before @rowanj eventually might feel the urge to merge it.

While I implemented this feature, I never really got used to it when I was running my own builds of GitX-dev. When it comes to stashing and switching branches etc, I use DTerm (open-source context aware hud-style terminal) to invoke git commands.

pvinis · 2014-11-11T13:29:05Z

i often use stash and an easy way to make named stashed etc would be nice. i will check DTerm though. thanks

schmurfy · 2014-11-12T09:42:29Z

it would be really nice to have this, it would be sad to let the work you did go to waste :)

pvinis · 2014-11-12T09:52:48Z

tried DTerm. looks like a very useful little app. the only problem is that i also use git bisect, and bisect has to be ran at the root of the repo.. now im sad again :p

muhqu · 2014-11-12T10:13:28Z

@pvinis without knowing much about git bisect, you might get what you want by adding an alias that just cds into the working copy's root directory and issues git bisect … there.

git config alias.biisect '!f(){(cd "$(git rev-parse --show-toplevel)"; git bisect "$@")};f'

…then you can use git biisect … from everywhere inside your working copy.

nguyenkims · 2015-11-04T15:59:28Z

Hey, anyone has updates about this PR ?

muhqu · 2015-11-04T18:59:20Z

...no. I haven't done any gitx development in a long time. Wondering if it even compiles with latest XCode... :-/

pvinis · 2015-11-04T19:00:33Z

i use it daily, but i have gitup for stashes.

On Τετ, Νοε 4, 2015 at 19:59, rowanj/gitx
reply@reply.github.com
wrote:
...no. I haven't done any gitx development in a long time. Wondering if it even
compiles with latest XCode... :-/

—
Reply to this email directly or view it on GitHub
[https://github.com//pull/239#issuecomment-153830795] .[https://github.com/notifications/beacon/AAGHiUyFl2FK13FiwaML4MLwLReTsc0Lks5pCk0NgaJpZM4A4iQX.gif]

muhqu · 2018-02-01T14:51:08Z

FYI the stash support of this PR has actually been integrated into this very active fork: https://github.com/gitx/gitx 🎉

muhqu added 7 commits August 6, 2013 07:36

added stashes property to PBGitRepository.

bafdb5c

As Objective-Git doesn't yet offer stash support use libgit2 right away. should be replaced by Objective-Git equivalent when available

add Stashes list to Sidebar.

b86c638

add menu items for stash items: "Pop stash@..", "Apply", "View Diff" and "Drop" but only "View Diff" functional yet

keep stashes in sidebar updated when repository changes

a369e4b

wire-up stash actions: pop, apply, drop

86e57c3

Note: use of deprecated [PBGitRepository outputInWorkdirForArguments:…] should be replaced with objective-git equivalent once stash-support is available.

added "Stash Changes" button and "Keep Index" checkbox to Commit View.

4145b3c

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.

wire-up stash save, with keep index option

da3d758

Note: use of deprecated [PBGitRepository outputInWorkdirForArguments:…] should be replaced with objective-git equivalent once stash-support is available.

make "Stash Changes" button inactive if working copy is clean.

d3224e5

- added IBOutlet for stashButton - added a trackedFilesController to easily get a count of tracked files

muhqu mentioned this pull request Aug 7, 2013

Add support for git stash #14

Open

muhqu added 2 commits August 11, 2013 22:47

out-comment too verbose logging

723bcda

added App Menu items under "Repository"

c298273

- "Stash Save ⌘Y" - "Stash Save - Keep Index ⌥⌘Y" (alternate) - "Stash Pop ⇧⌘Y"

muhqu added 3 commits August 16, 2013 07:35

improve keyboard navigation in commit dialog

3205ed4

quick and dirty show stash error messages via showErrorSheet

a6bb122

Merge branch 'gitx-dev-commit-tab' into gitx-dev-stashes

5d8e03c

muhqu reviewed Aug 21, 2013
View reviewed changes

Classes/git/PBGitRepository.m

Copy link

Author

muhqu Aug 21, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rowanj I know showErrorSheet... is deprecated, but what's the proposed alternative?

rowanj added a commit that referenced this pull request Sep 20, 2013

Update #239 for master after merge of #2

9588379

rowanj added a commit that referenced this pull request Sep 20, 2013

Update #239 for the libgit2/objective-git API in the submodule versio…

806aaad

…n on master

rowanj added a commit that referenced this pull request Sep 20, 2013

Review #239 - PBGitStash

1c3fb8d

Missing `[super init]`

rowanj added a commit that referenced this pull request Sep 20, 2013

Review #239 - Consistent spacing

60b6edd

rowanj added a commit that referenced this pull request Sep 20, 2013

Review #239 - More spacing

2670f38

rowanj added a commit that referenced this pull request Sep 20, 2013

Review #239 - Remove @synthesize where it's not required

c02e555

tiennou mentioned this pull request Feb 13, 2015

Stash support #431

Closed

Conversation

muhqu commented Aug 7, 2013

Uh oh!

schmurfy commented Aug 8, 2013

Uh oh!

schmurfy commented Aug 14, 2013

Uh oh!

kieran commented Aug 15, 2013

Uh oh!

emptyflask commented Aug 21, 2013

Uh oh!

muhqu Aug 21, 2013

Choose a reason for hiding this comment

Uh oh!

muhqu commented Aug 21, 2013

Uh oh!

muhqu commented Aug 21, 2013

Uh oh!

emptyflask commented Aug 21, 2013

Uh oh!

kieran commented Aug 21, 2013

Uh oh!

schmurfy commented Aug 22, 2013

Uh oh!

schmurfy commented Aug 22, 2013

Uh oh!

rowanj commented Aug 23, 2013

Uh oh!

mengelbrecht commented Aug 29, 2013

Uh oh!

schmurfy commented Aug 30, 2013

Uh oh!

kieran commented Sep 19, 2013

Uh oh!

muhqu commented Sep 19, 2013

Uh oh!

muhqu commented Sep 19, 2013

Uh oh!

kieran commented Sep 19, 2013

Uh oh!

rowanj commented Sep 20, 2013

Uh oh!

aoxborrow commented Oct 9, 2013

Uh oh!

pvinis commented Nov 11, 2014

Uh oh!

muhqu commented Nov 11, 2014

Uh oh!

pvinis commented Nov 11, 2014

Uh oh!

schmurfy commented Nov 12, 2014

Uh oh!

pvinis commented Nov 12, 2014

Uh oh!

muhqu commented Nov 12, 2014

Uh oh!

nguyenkims commented Nov 4, 2015

Uh oh!

muhqu commented Nov 4, 2015

Uh oh!

pvinis commented Nov 4, 2015

Uh oh!

muhqu commented Feb 1, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants