mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-06 08:26:41 -04:00
wxiaoguang
6ba907d89c
1. Fix ugly commit form "warning" message 2. Use JSONError for "Update PR Branch" response 3. Remove useless "timeline" class 4. Make timeline review default to "comment" to avoid icon missing 5. Align PR's "command line instructions" UI 6. Simply "Update PR branch" button logic And then some TODOs are fixed. --------- Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>
65 lines
2.6 KiB
Handlebars
65 lines
2.6 KiB
Handlebars
{{$data := $.MergeBoxData}}
|
|
{{$pull := $.PullRequest}}
|
|
<details>
|
|
<summary class="tw-pl-1">{{/* align with other item icon & text */}}
|
|
<span class="tw-pl-2">{{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}}</span>
|
|
</summary>
|
|
<div class="tw-my-[5px]">
|
|
<div>
|
|
<h3 class="tw-m-0">{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>
|
|
{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}
|
|
</div>
|
|
{{$localBranch := $pull.HeadBranch}}
|
|
{{if ne $pull.HeadRepo.ID $pull.BaseRepo.ID}}
|
|
{{$localBranch = print $pull.HeadRepo.OwnerName "-" $pull.HeadBranch}}
|
|
{{end}}
|
|
<div class="ui secondary segment tw-font-mono">
|
|
{{$gitRemoteName := ctx.RootData.SystemConfig.Repository.GitGuideRemoteName.Value ctx}}
|
|
{{if eq $pull.Flow 0}}
|
|
<div>git fetch -u {{if ne $pull.HeadRepo.ID $pull.BaseRepo.ID}}{{ctx.AppFullLink $pull.HeadRepo.Link}}{{else}}{{$gitRemoteName}}{{end}} {{$pull.HeadBranch}}:{{$localBranch}}</div>
|
|
{{else}}
|
|
<div>git fetch -u {{$gitRemoteName}} {{$pull.GetGitHeadRefName}}:{{$localBranch}}</div>
|
|
{{end}}
|
|
<div>git checkout {{$localBranch}}</div>
|
|
</div>
|
|
{{if $data.ShowMergeInstructions}}
|
|
<div>
|
|
<h3 class="tw-m-0">{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>
|
|
{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}
|
|
{{if not $data.AutodetectManualMerge}}
|
|
<div>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}</div>
|
|
{{end}}
|
|
</div>
|
|
<div class="ui secondary segment tw-font-mono">
|
|
<div data-pull-merge-style="merge">
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge --no-ff {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="rebase">
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="rebase-merge">
|
|
<div>git checkout {{$localBranch}}</div>
|
|
<div>git rebase {{$pull.BaseBranch}}</div>
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge --no-ff {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="squash">
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge --squash {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="fast-forward-only">
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="manually-merged">
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge {{$localBranch}}</div>
|
|
</div>
|
|
<div>git push {{$gitRemoteName}} {{$pull.BaseBranch}}</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</details>
|