2022-08-25 21:55:52 +00:00
|
|
|
{{$index := 0}}
|
2020-05-23 22:05:20 +00:00
|
|
|
<div class="timeline-item commits-list">
|
2021-08-09 18:08:51 +00:00
|
|
|
{{range .comment.Commits}}
|
2022-08-25 21:55:52 +00:00
|
|
|
{{$tag := printf "%s-%d" $.comment.HashTag $index}}
|
Use a general Eval function for expressions in templates. (#23927)
One of the proposals in #23328
This PR introduces a simple expression calculator
(templates/eval/eval.go), it can do basic expression calculations.
Many untested template helper functions like `Mul` `Add` can be replaced
by this new approach.
Then these `Add` / `Mul` / `percentage` / `Subtract` / `DiffStatsWidth`
could all use this `Eval`.
And it provides enhancements for Golang templates, and improves
readability.
Some examples:
----
* Before: `{{Add (Mul $glyph.Row 12) 12}}`
* After: `{{Eval $glyph.Row "*" 12 "+" 12}}`
----
* Before: `{{if lt (Add $i 1) (len $.Topics)}}`
* After: `{{if Eval $i "+" 1 "<" (len $.Topics)}}`
## FAQ
### Why not use an existing expression package?
We need a highly customized expression engine:
* do the calculation on the fly, without pre-compiling
* deal with int/int64/float64 types, to make the result could be used in
Golang template.
* make the syntax could be used in the Golang template directly
* do not introduce too much complex or strange syntax, we just need a
simple calculator.
* it needs to strictly follow Golang template's behavior, for example,
Golang template treats all non-zero values as truth, but many 3rd
packages don't do so.
### What's the benefit?
* Developers don't need to add more `Add`/`Mul`/`Sub`-like functions,
they were getting more and more.
Now, only one `Eval` is enough for all cases.
* The new code reads better than old `{{Add (Mul $glyph.Row 12) 12}}`,
the old one isn't familiar to most procedural programming developers
(eg, the Golang expression syntax).
* The `Eval` is fully covered by tests, many old `Add`/`Mul`-like
functions were never tested.
### The performance?
It doesn't use `reflect`, it doesn't need to parse or compile when used
in Golang template, the performance is as fast as native Go template.
### Is it too complex? Could it be unstable?
The expression calculator program is a common homework for computer
science students, and it's widely used as a teaching and practicing
purpose for developers. The algorithm is pretty well-known.
The behavior can be clearly defined, it is stable.
2023-04-07 13:25:49 +00:00
|
|
|
{{$index = Eval $index "+" 1}}
|
2020-05-23 22:05:20 +00:00
|
|
|
<div class="singular-commit" id="{{$tag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge badge-commit">{{svg "octicon-git-commit"}}</span>
|
2020-05-20 12:47:24 +00:00
|
|
|
{{if .User}}
|
2024-04-17 08:58:08 +00:00
|
|
|
<a class="avatar" href="{{.User.HomeLink}}">{{ctx.AvatarUtils.Avatar .User 20}}</a>
|
2020-05-20 12:47:24 +00:00
|
|
|
{{else}}
|
2024-04-17 08:58:08 +00:00
|
|
|
{{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 20}}
|
2020-05-20 12:47:24 +00:00
|
|
|
{{end}}
|
|
|
|
|
|
2023-03-27 14:44:51 +00:00
|
|
|
{{$commitLink:= printf "%s/commit/%s" $.comment.Issue.PullRequest.BaseRepo.Link (PathEscape .ID.String)}}
|
|
|
|
|
|
2024-04-17 08:58:08 +00:00
|
|
|
<span class="tw-flex-1 gt-ellipsis tw-font-mono{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject $.root.Context .Message $commitLink ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx)}}</span>
|
|
|
|
|
|
|
|
|
|
{{if IsMultilineCommitMessage .Message}}
|
|
|
|
|
<button class="ui button js-toggle-commit-body ellipsis-button" aria-expanded="false">...</button>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if IsMultilineCommitMessage .Message}}
|
|
|
|
|
<pre class="commit-body tw-hidden">{{RenderCommitBody $.root.Context .Message ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx)}}</pre>
|
|
|
|
|
{{end}}
|
|
|
|
|
|
|
|
|
|
<span class="shabox tw-flex tw-items-center">
|
2023-11-02 14:49:02 +00:00
|
|
|
{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}}
|
2020-05-20 12:47:24 +00:00
|
|
|
{{$class := "ui sha label"}}
|
|
|
|
|
{{if .Signature}}
|
2023-09-16 03:51:54 +00:00
|
|
|
{{$class = (print $class " isSigned")}}
|
2020-05-20 12:47:24 +00:00
|
|
|
{{if .Verification.Verified}}
|
|
|
|
|
{{if eq .Verification.TrustStatus "trusted"}}
|
2023-09-16 03:51:54 +00:00
|
|
|
{{$class = (print $class " isVerified")}}
|
2020-05-20 12:47:24 +00:00
|
|
|
{{else if eq .Verification.TrustStatus "untrusted"}}
|
2023-09-16 03:51:54 +00:00
|
|
|
{{$class = (print $class " isVerifiedUntrusted")}}
|
2020-05-20 12:47:24 +00:00
|
|
|
{{else}}
|
2023-09-16 03:51:54 +00:00
|
|
|
{{$class = (print $class " isVerifiedUnmatched")}}
|
2020-05-20 12:47:24 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{else if .Verification.Warning}}
|
2023-09-16 03:51:54 +00:00
|
|
|
{{$class = (print $class " isWarning")}}
|
2020-05-20 12:47:24 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{end}}
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 16:42:49 +00:00
|
|
|
<a href="{{$commitLink}}" rel="nofollow" class="tw-ml-2 {{$class}}">
|
2023-03-27 14:44:51 +00:00
|
|
|
<span class="shortsha">{{ShortSha .ID.String}}</span>
|
|
|
|
|
{{if .Signature}}
|
|
|
|
|
{{template "repo/shabox_badge" dict "root" $.root "verification" .Verification}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</a>
|
2020-05-20 12:47:24 +00:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2020-05-23 22:05:20 +00:00
|
|
|
</div>
|