mirror of
https://github.com/go-gitea/gitea.git
synced 2024-09-05 23:34:19 -04:00
Display human-readable text instead of cryptic filemodes (#26352)
Now, you don't need to be a git expert anymore to know what these numbers mean. ## Before ![grafik](https://github.com/go-gitea/gitea/assets/51889757/9a964bf6-10fd-40a6-aeb2-ac8f437f8c32) ## After ![grafik](https://github.com/go-gitea/gitea/assets/51889757/84573cb9-55b6-4dde-9866-95f71b657554) or when the mode actually changed: ![grafik](https://github.com/go-gitea/gitea/assets/51889757/0f327538-ebdc-40e7-8c99-f9e21b67f638)
This commit is contained in:
parent
c1c83dbaec
commit
8736b134bd
@ -3505,3 +3505,12 @@ variables.update.success = The variable has been edited.
|
|||||||
type-1.display_name = Individual Project
|
type-1.display_name = Individual Project
|
||||||
type-2.display_name = Repository Project
|
type-2.display_name = Repository Project
|
||||||
type-3.display_name = Organization Project
|
type-3.display_name = Organization Project
|
||||||
|
|
||||||
|
[git.filemode]
|
||||||
|
changed_filemode = %[1]s → %[2]s
|
||||||
|
# Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
|
||||||
|
directory = Directory
|
||||||
|
normal_file = Normal file
|
||||||
|
executable_file = Executable file
|
||||||
|
symbolic_link = Symbolic link
|
||||||
|
submodule = Submodule
|
||||||
|
@ -427,6 +427,23 @@ func (diffFile *DiffFile) ShouldBeHidden() bool {
|
|||||||
return diffFile.IsGenerated || diffFile.IsViewed
|
return diffFile.IsGenerated || diffFile.IsViewed
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (diffFile *DiffFile) ModeTranslationKey(mode string) string {
|
||||||
|
switch mode {
|
||||||
|
case "040000":
|
||||||
|
return "git.filemode.directory"
|
||||||
|
case "100644":
|
||||||
|
return "git.filemode.normal_file"
|
||||||
|
case "100755":
|
||||||
|
return "git.filemode.executable_file"
|
||||||
|
case "120000":
|
||||||
|
return "git.filemode.symbolic_link"
|
||||||
|
case "160000":
|
||||||
|
return "git.filemode.submodule"
|
||||||
|
default:
|
||||||
|
return mode
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func getCommitFileLineCount(commit *git.Commit, filePath string) int {
|
func getCommitFileLineCount(commit *git.Commit, filePath string) int {
|
||||||
blob, err := commit.GetBlobByPath(filePath)
|
blob, err := commit.GetBlobByPath(filePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -130,9 +130,11 @@
|
|||||||
<span class="ui label">{{$.locale.Tr "repo.diff.vendored"}}</span>
|
<span class="ui label">{{$.locale.Tr "repo.diff.vendored"}}</span>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if and $file.Mode $file.OldMode}}
|
{{if and $file.Mode $file.OldMode}}
|
||||||
<span class="gt-ml-4 gt-mono">{{$file.OldMode}} → {{$file.Mode}}</span>
|
{{$old := $.locale.Tr ($file.ModeTranslationKey $file.OldMode)}}
|
||||||
|
{{$new := $.locale.Tr ($file.ModeTranslationKey $file.Mode)}}
|
||||||
|
<span class="gt-ml-4 gt-mono">{{$.locale.Tr "git.filemode.changed_filemode" $old $new}}</span>
|
||||||
{{else if $file.Mode}}
|
{{else if $file.Mode}}
|
||||||
<span class="gt-ml-4 gt-mono">{{$file.Mode}}</span>
|
<span class="gt-ml-4 gt-mono">{{$.locale.Tr ($file.ModeTranslationKey $file.Mode)}}</span>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
<div class="diff-file-header-actions gt-df gt-ac gt-gap-2 gt-fw">
|
<div class="diff-file-header-actions gt-df gt-ac gt-gap-2 gt-fw">
|
||||||
|
Loading…
Reference in New Issue
Block a user