preview the number of commits that will be rebased by shiftkey · Pull Request #7167 · desktop/desktop

shiftkey · 2019-03-26T21:28:33Z

Overview

Closes #6959

Description

Similar to the Merge Branch flow, the Rebase Flow now shows the number of commits that will be moved as part of the operation:

#6960 is tracking detecting conflicts at this stage, so for now this PR is focused on just the happy path and it's testing.

use the component in the "Choose Branch" stage to show the status of the rebase
pass information from APIs added in plumbing to get rebase progress and setup for use in the app #7175 into the rebase flow state, so that commit messages can be shown without relying on the underling Git operation
tidy up CSS to reduce excessive whitespace
tidy up history to make changes easier to follow
rebase on top of plumbing to get rebase progress and setup for use in the app #7175 once merged, and tidy up history
show "up to date" message when rebase does not contain any commits to rebase

Some additional polish related to this area while I'm in here testing:

extract MergeStatusHeader into a generalized UI component ActionStatusIcon (lots of internals are hard-coded to merge-status
render Emoji in the progress view if the commit message contains any :emoji:

Release notes

Notes: no-notes

tierninho · 2019-04-02T19:29:43Z

For reference only, as we already discussed in chat.

When no merge hint is surfaced, selecting the branch leads to crash.

TypeError: Cannot read property 'summary' of undefined
    at RebaseFlow.setState.prevState (app/src/ui/rebase/rebase-flow.tsx:289:60)
    at getStateFromUpdate (app/node_modules/react-dom/cjs/react-dom.development.js:6400:1)
    at processUpdateQueue (app/node_modules/react-dom/cjs/react-dom.development.js:6489:1)
    at updateClassInstance (app/node_modules/react-dom/cjs/react-dom.development.js:7143:1)
    at updateClassComponent (app/node_modules/react-dom/cjs/react-dom.development.js:8345:1)
    at beginWork (app/node_modules/react-dom/cjs/react-dom.development.js:8982:1)
    at performUnitOfWork (app/node_modules/react-dom/cjs/react-dom.development.js:11814:1)
    at workLoop (app/node_modules/react-dom/cjs/react-dom.development.js:11843:1)
    at HTMLUnknownElement.callCallback (app/node_modules/react-dom/cjs/react-dom.development.js:100:1)
    at Object.invokeGuardedCallbackDev (app/node_modules/react-dom/cjs/react-dom.development.js:138:1)

Version: 1.7.0-beta1
OS: Mac OS 10.14.4

3d1a057

shiftkey · 2019-04-02T19:33:02Z

@tierninho

When no merge hint is surfaced, selecting the branch leads to crash.

Any clue how I might trip this state? I gather something like "branch at the same commit" might be a way to trigger this visual state?

shiftkey · 2019-04-02T20:18:25Z

I've made a change in a83b297 that clarifies the UI and blocks the rebase from continuing - @tierninho let me know if you find new ways to break this path:

tierninho · 2019-04-02T21:37:18Z

So far looks good to me. 👍

app/src/lib/rebase.ts

app/src/models/banner.ts

app/src/ui/banners/rebase-conflicts-banner.tsx

app/src/ui/lib/action-status-icon.tsx

app/styles/ui/rebase-status.scss

app/src/ui/rebase/choose-branch.tsx

Co-Authored-By: shiftkey <brendan@github.com>

…tant here

tierninho · 2019-04-04T00:03:17Z

For rebasing, did we want to update the green checkmark to a warning sign if conflicts are present?

shiftkey · 2019-04-04T10:42:46Z

For rebasing, did we want to update the green checkmark to a warning sign if conflicts are present?

@tierninho this is captured in #6960 and is on my radar for post-rebase-MVP

niik

Just one tiny ask and then we can land this. Thanks for bearing with me

app/styles/_variables.scss

app/styles/ui/rebase-status.scss

niik · 2019-04-04T11:34:42Z

app/styles/ui/rebase-status.scss

+      border: solid transparent;
+      box-sizing: content-box;
+      position: relative;
+      z-index: 1;


I'm happy to leave this to someone with some bandwidth and CSS skills to figure out if it doesn't need to hold up this PR.

👍 Sounds good

shiftkey changed the title ~~Shiftkey/rebase/show rebase preview~~ preview the number of commits that will be rebased Mar 26, 2019

shiftkey mentioned this pull request Mar 26, 2019

move rebase flow to a multi-dialog flow #7117

Merged

12 tasks

shiftkey force-pushed the shiftkey/rebase/show-rebase-preview branch 3 times, most recently from 2b2b31c to 2e49bf8 Compare March 28, 2019 18:00

shiftkey mentioned this pull request Mar 28, 2019

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

Merged

6 tasks

shiftkey force-pushed the shiftkey/rebase/switch-to-multi-dialog-flow branch from 0c62cd0 to b519e06 Compare March 28, 2019 21:21

shiftkey force-pushed the shiftkey/rebase/show-rebase-preview branch from 56d51bb to e4fd487 Compare April 1, 2019 14:45

shiftkey changed the base branch from shiftkey/rebase/switch-to-multi-dialog-flow to git-plumbing-for-rebase-progress April 1, 2019 14:45

shiftkey force-pushed the shiftkey/rebase/show-rebase-preview branch 2 times, most recently from 442a074 to e98d9ea Compare April 1, 2019 17:49

shiftkey changed the base branch from git-plumbing-for-rebase-progress to development April 1, 2019 17:49

shiftkey added the ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Apr 1, 2019

shiftkey marked this pull request as ready for review April 1, 2019 18:04

shiftkey added 13 commits April 2, 2019 16:31

add previousProgress to help with rehydrating rebase

f862c61

load previous progress from Git repository

6f9662c

rename MergeStatusHeader to ActionStatusIcon and update usages

d8b14a6

rename this to be more explicit

1d9de2a

add styles for rebase preview component

2788def

propagate emoji into progress dialong to format commit messages

92c0591

test rebase and show in choose branch dialog

1a3d094

use new ActionStatusIcon in rebase flow

603b32f

update setState to show commit message associated with progress

cb4d468

making names more consistent

5486d04

make onOpenDialog signature explicitly return Promise<void>

a43b795

undefined props are super-easy to lose when you rename things

e49ac43

tidy up and naming things

6d8d555

shiftkey force-pushed the shiftkey/rebase/show-rebase-preview branch from 5474ee6 to 6d8d555 Compare April 2, 2019 19:31

shiftkey mentioned this pull request Apr 2, 2019

lift state out of rebase flow components to live in repository state #7203

Merged

11 tasks

shiftkey requested a review from a team April 2, 2019 20:41

shiftkey added this to the 1.7.0 milestone Apr 2, 2019

Merge branch 'development' into shiftkey/rebase/show-rebase-preview

ba38b0a

tierninho mentioned this pull request Apr 2, 2019

make new rebase flow available for beta users #7191

Merged

niik self-assigned this Apr 3, 2019

niik requested changes Apr 3, 2019

View reviewed changes

niik and others added 8 commits April 3, 2019 08:25

Apply suggestions from code review

828b5f5

Co-Authored-By: shiftkey <brendan@github.com>

use simpler React fragment syntax

bfca9ab

extract colors to variables

e63092a

switch to plain functions, add some docs

fb79300

guard against empty array here

751cc7f

Update app/src/ui/lib/action-status-icon.tsx

5847112

Co-Authored-By: shiftkey <brendan@github.com>

liiiiint

69c6864

drop this back to a plain callback because the asynchrony isn't impor…

2824aeb

…tant here

shiftkey requested a review from niik April 3, 2019 12:30

shiftkey added 2 commits April 3, 2019 10:53

Merge branch 'development' into shiftkey/rebase/show-rebase-preview

5da3b0c

Merge branch 'development' into shiftkey/rebase/show-rebase-preview

ff6d223

niik requested changes Apr 4, 2019

View reviewed changes

shiftkey and others added 2 commits April 4, 2019 09:27

port these variables to the dark theme

21f7a87

Merge branch 'development' into shiftkey/rebase/show-rebase-preview

9f61bf6

shiftkey requested a review from niik April 4, 2019 12:28

shiftkey mentioned this pull request Apr 4, 2019

improve CSS styling for merge/rebase status indicator #7216

Open

niik approved these changes Apr 4, 2019

View reviewed changes

niik merged commit 5e3692a into development Apr 4, 2019

shiftkey deleted the shiftkey/rebase/show-rebase-preview branch April 4, 2019 21:12

Conversation

shiftkey commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Overview

Description

Release notes

Uh oh!

tierninho commented Apr 2, 2019

Uh oh!

shiftkey commented Apr 2, 2019

Uh oh!

shiftkey commented Apr 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tierninho commented Apr 2, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tierninho commented Apr 4, 2019

Uh oh!

shiftkey commented Apr 4, 2019

Uh oh!

niik left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

niik Apr 4, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

shiftkey commented Mar 26, 2019 •

edited

Loading

shiftkey commented Apr 2, 2019 •

edited

Loading