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

Jump to bottom

[Stashing] Stash Diff Viewer #7213

Merged
merged 50 commits into from Apr 11, 2019
Merged

[Stashing] Stash Diff Viewer #7213

merged 50 commits into from Apr 11, 2019

Conversation

outofambit
Copy link
Contributor

@outofambit outofambit commented Apr 3, 2019 •
edited

🌵 🌵 Review this before #7210 🌵 🌵

(the primary intent here is to get @iAmWillShepherd's thoughts on this before #7210 is reviewed/merged, but others' feedback is certainly welcome and helpful!)

Overview

This PR adds the ability to view the contents of a stash (files and their diffs) to the new stashing workflow.

gif

Implementation

  • adds Stash Diff Viewer UI component (based heavily on history commit viewer components)
  • adds app UI state for the Stash Diff Viewer component
  • adds dispatcher/app-store/git-store glue between components and git functionality
  • adds state to stashEntry to include a list of files touched by that stash

@outofambit outofambit added this to the 1.7.0 milestone Apr 3, 2019
@iAmWillShepherd iAmWillShepherd mentioned this pull request Apr 3, 2019
Closed
6 tasks
@iAmWillShepherd iAmWillShepherd changed the title stash diff ui [Stashing] Diff view for stash commits Apr 5, 2019
@outofambit outofambit marked this pull request as ready for review April 9, 2019 18:57
@outofambit outofambit changed the title [Stashing] Diff view for stash commits [Stashing] Stash Diff Viewer Apr 9, 2019
@outofambit outofambit added ready-for-review Pull Requests that are ready to be reviewed by the maintainers time-sensitive Pull Requests where reviews need to happen in a timely manner labels Apr 11, 2019
iAmWillShepherd
iAmWillShepherd suggested changes Apr 11, 2019
View reviewed changes
app/src/models/stash-entry.ts Show resolved Hide resolved
app/src/models/stash-entry.ts Outdated Show resolved Hide resolved
app/src/models/stash-entry.ts Outdated Show resolved Hide resolved
app/src/ui/repository.tsx Outdated Show resolved Hide resolved
shiftkey
shiftkey reviewed Apr 11, 2019
View reviewed changes
app/src/lib/stores/app-store.ts Outdated Show resolved Hide resolved
app/src/lib/stores/app-store.ts Outdated Show resolved Hide resolved
app/src/lib/stores/app-store.ts Outdated Show resolved Hide resolved
app/src/models/stash-entry.ts Outdated Show resolved Hide resolved
app/src/models/stash-entry.ts Outdated Show resolved Hide resolved
app/src/models/stash-entry.ts Outdated Show resolved Hide resolved
app/src/lib/stores/app-store.ts Outdated Show resolved Hide resolved
@shiftkey
Copy link
Member

Does this need a separate reviewer or are you on top of this @iAmWillShepherd?

@iAmWillShepherd
Copy link
Contributor

Does this need a separate reviewer or are you on top of this @iAmWillShepherd?

I got it. Thanks for popping in and adding some additional review points. ⚡️

@iAmWillShepherd iAmWillShepherd merged commit 686fbbc into stash-changes-on-branch Apr 11, 2019
@iAmWillShepherd iAmWillShepherd deleted the stash-diff-ui branch April 11, 2019 21:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shiftkey shiftkey shiftkey left review comments

@iAmWillShepherd iAmWillShepherd iAmWillShepherd approved these changes

Assignees

@iAmWillShepherd iAmWillShepherd

Labels
ready-for-review Pull Requests that are ready to be reviewed by the maintainers time-sensitive Pull Requests where reviews need to happen in a timely manner
Projects
None yet
Milestone
2.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@outofambit @shiftkey @iAmWillShepherd