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.

Sign up for GitHub

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

Jump to bottom

Gitx dev stashes #239

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Gitx dev stashes #239

wants to merge 12 commits into from

Commits on Aug 6, 2013

  1. added stashes property to PBGitRepository. 

    As Objective-Git doesn't yet offer stash support use libgit2 right away. should be replaced by Objective-Git equivalent when available
    @muhqu
    muhqu committed Aug 6, 2013
    Configuration menu
    Copy the full SHA
    bafdb5c View commit details
    Browse the repository at this point in the history

  2. add Stashes list to Sidebar. 

    add menu items for stash items: "Pop stash@..", "Apply", "View Diff" and "Drop"
but only "View Diff" functional yet
    @muhqu
    muhqu committed Aug 6, 2013
    Configuration menu
    Copy the full SHA
    b86c638 View commit details
    Browse the repository at this point in the history

  3. keep stashes in sidebar updated when repository changes

    @muhqu
    muhqu committed Aug 6, 2013
    Configuration menu
    Copy the full SHA
    a369e4b View commit details
    Browse the repository at this point in the history

  4. wire-up stash actions: pop, apply, drop 

    Note: use of deprecated [PBGitRepository outputInWorkdirForArguments:…] should be replaced with objective-git equivalent once stash-support is available.
    @muhqu
    muhqu committed Aug 6, 2013
    Configuration menu
    Copy the full SHA
    86e57c3 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2013

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

    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.
    @muhqu
    muhqu committed Aug 7, 2013
    Configuration menu
    Copy the full SHA
    4145b3c View commit details
    Browse the repository at this point in the history

  2. wire-up stash save, with keep index option 

    Note: use of deprecated [PBGitRepository outputInWorkdirForArguments:…] should be replaced with objective-git equivalent once stash-support is available.
    @muhqu
    muhqu committed Aug 7, 2013
    Configuration menu
    Copy the full SHA
    da3d758 View commit details
    Browse the repository at this point in the history

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

    - added IBOutlet for stashButton
- added a trackedFilesController to easily get a count of tracked files
    @muhqu
    muhqu committed Aug 7, 2013
    Configuration menu
    Copy the full SHA
    d3224e5 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2013

  1. out-comment too verbose logging

    @muhqu
    muhqu committed Aug 11, 2013
    Configuration menu
    Copy the full SHA
    723bcda View commit details
    Browse the repository at this point in the history

  2. added App Menu items under "Repository" 

    - "Stash Save ⌘Y"
- "Stash Save - Keep Index ⌥⌘Y" (alternate)
- "Stash Pop ⇧⌘Y"
    @muhqu
    muhqu committed Aug 11, 2013
    Configuration menu
    Copy the full SHA
    c298273 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2013

  1. improve keyboard navigation in commit dialog

    @muhqu
    muhqu committed Aug 16, 2013
    Configuration menu
    Copy the full SHA
    3205ed4 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2013

  1. quick and dirty show stash error messages via showErrorSheet

    @muhqu
    muhqu committed Aug 21, 2013
    Configuration menu
    Copy the full SHA
    a6bb122 View commit details
    Browse the repository at this point in the history

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

    @muhqu
    muhqu committed Aug 21, 2013
    Configuration menu
    Copy the full SHA
    5d8e03c View commit details
    Browse the repository at this point in the history