development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-19 16:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add message about unrelated commit histories to no changes view

Browse source
This commit is contained in:
tidy-dev 2022-10-06 09:26:56 -04:00
parent 55f4d561d5
commit c2232a52c3
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/ui/open-pull-request/open-pull-request-dialog.tsx
View file

@ -12,6 +12,7 @@ import * as OcticonSymbol from '../octicons/octicons.generated'
import { OpenPullRequestDialogHeader } from './open-pull-request-header'
import { PullRequestFilesChanged } from './pull-request-files-changed'
import { PullRequestMergeStatus } from './pull-request-merge-status'
import { ComputedAction } from '../../models/computed-action'
interface IOpenPullRequestDialogProps {
readonly repository: Repository
@ -148,20 +149,30 @@ export class OpenPullRequestDialog extends React.Component<IOpenPullRequestDialo
private renderNoChanges() {
const { pullRequestState, currentBranch } = this.props
const { commitSelection, baseBranch } = pullRequestState
const { commitSelection, baseBranch, mergeStatus } = pullRequestState
const { shas } = commitSelection
if (shas.length !== 0) {
return
}
const hasMergeBase = mergeStatus?.kind !== ComputedAction.Invalid
const message = hasMergeBase ? (
<>
<Ref>{baseBranch.name}</Ref> is up to date with all commits from{' '}
<Ref>{currentBranch.name}</Ref>.
</>
) : (
<>
<Ref>{baseBranch.name}</Ref> and <Ref>{currentBranch.name}</Ref> are
entirely different commit histories.
</>
)
return (
<div className="open-pull-request-no-changes">
<div>
<Octicon symbol={OcticonSymbol.gitPullRequest} />
<h3>There are no changes.</h3>
<Ref>{baseBranch.name}</Ref> is up to date with all commits from{' '}
<Ref>{currentBranch.name}</Ref>.
{message}
</div>
</div>
)