Skip to content

plumbing to get rebase progress and setup for use in the app#7175

Merged
iAmWillShepherd merged 17 commits intodevelopmentfrom
git-plumbing-for-rebase-progress
Apr 1, 2019
Merged

plumbing to get rebase progress and setup for use in the app#7175
iAmWillShepherd merged 17 commits intodevelopmentfrom
git-plumbing-for-rebase-progress

Conversation

@shiftkey
Copy link
Member

@shiftkey shiftkey commented Mar 28, 2019 •
edited
Loading

Overview

This PR has been split off from #7167 and includes just the changes required to invoke Git and propagate the data into the app.

Description

  • following on from tidy up merge status model and introduce rebase status model #7135, I settled on ComputedAction as the general name to encompass both the "merge status" and "rebase status" states, and refreshed the usages and docs
  • additional fields for progress are reported from IRebaseProgress that are useful in the rebase progress dialog
  • added getCommitsInRange function to generate the list of commits that will be used in a non-interactive rebase
  • added getCurrentProgress to inspect the .git/rebase-apply/ directory when conflicts detected and generate a progress summary
  • documentation about the setup of a rebase that motivates these two Git functions
  • tests to cover these functions and validate their usage

Release notes

Notes: no-notes

@shiftkey shiftkey mentioned this pull request Mar 28, 2019
Merged
8 tasks
@shiftkey shiftkey force-pushed the git-plumbing-for-rebase-progress branch from 9475e6e to d606b0b Compare March 28, 2019 18:52
@shiftkey shiftkey added the ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Mar 28, 2019
@shiftkey
Copy link
Member Author

shiftkey commented Mar 28, 2019

@desktop/engineering marking this one as ready-for-review despite there being outstanding tasks because I'd love some 👀 to make a first pass and see how these current changes feel. I'm trying to get these changes in for the beta next week without skimping on quality, and some initial feedback on what's proposed here would help greatly...

@shiftkey shiftkey marked this pull request as ready for review March 28, 2019 20:02
@iAmWillShepherd iAmWillShepherd self-assigned this Mar 29, 2019
@shiftkey
Copy link
Member Author

shiftkey commented Mar 29, 2019

I've added some docs in 6f209e1 which should cover the changes. There's other parts to this that I plan to flesh out next week which are called out as **TODO** entries

Rendered Markdown

@shiftkey shiftkey added this to the 1.7.0 milestone Apr 1, 2019
iAmWillShepherd
iAmWillShepherd approved these changes Apr 1, 2019
View reviewed changes
Copy link
Contributor

@iAmWillShepherd iAmWillShepherd left a comment

Choose a reason for hiding this comment

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

My review was of technical implementation only. The rebase-flow doc shouldn't be a blocker for this branch.

@shiftkey
Copy link
Member Author

shiftkey commented Apr 1, 2019

@iAmWillShepherd any objections to merging this in today so I can move #7167 out of draft status?

@iAmWillShepherd iAmWillShepherd merged commit 2dac9ec into development Apr 1, 2019
@shiftkey shiftkey deleted the git-plumbing-for-rebase-progress branch April 2, 2019 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@iAmWillShepherd iAmWillShepherd iAmWillShepherd approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@iAmWillShepherd iAmWillShepherd

Labels

ready-for-review Pull Requests that are ready to be reviewed by the maintainers

Projects

None yet

Milestone

2.0

Development

Successfully merging this pull request may close these issues.

2 participants

@shiftkey @iAmWillShepherd