From 2c825561bfff00fdfc53485235637e5a09365061 Mon Sep 17 00:00:00 2001 From: stuzer05 Date: Sun, 26 Feb 2023 12:46:04 +0200 Subject: [PATCH 1/6] Commit --- services/gitdiff/gitdiff.go | 19 +++++++++++++++++++ templates/repo/diff/box.tmpl | 5 +++++ 2 files changed, 24 insertions(+) diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 4a74c1a8944e5..0ab2f0d461d05 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -14,6 +14,7 @@ import ( "io" "net/url" "os" + "regexp" "sort" "strings" "time" @@ -358,6 +359,8 @@ type DiffFile struct { IsViewed bool // User specific HasChangedSinceLastReview bool // User specific Language string + Mode string + OldMode string } // GetType returns type of diff file. @@ -577,9 +580,25 @@ parsingLoop: break curFileLoop case strings.HasPrefix(line, "old mode ") || strings.HasPrefix(line, "new mode "): + + if strings.HasPrefix(line, "old mode ") { + r := regexp.MustCompile(`old mode (\d{6})`) + matched := r.FindStringSubmatch(line) + curFile.OldMode = matched[1] + } + if strings.HasPrefix(line, "new mode ") { + r := regexp.MustCompile(`new mode (\d{6})`) + matched := r.FindStringSubmatch(line) + curFile.Mode = matched[1] + } + if strings.HasSuffix(line, " 160000\n") { curFile.IsSubmodule = true } + case strings.HasPrefix(line, "new file mode "): + r := regexp.MustCompile(`new file mode (\d{6})`) + matched := r.FindStringSubmatch(line) + curFile.Mode = matched[1] case strings.HasPrefix(line, "rename from "): curFile.IsRenamed = true curFile.Type = DiffFileRename diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 4e6879650ddcc..3532037abc112 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -103,6 +103,11 @@ {{if $file.IsVendored}} {{$.locale.Tr "repo.diff.vendored"}} {{end}} + {{if and $file.Mode $file.OldMode}} + {{$file.Mode}} → {{$file.OldMode}} + {{else if $file.Mode}} + new mode → {{$file.Mode}} + {{end}}
{{if $showFileViewToggle}} From ea22b31370c233239922cb3d7a20da16f13d1a17 Mon Sep 17 00:00:00 2001 From: stuzer05 Date: Sun, 26 Feb 2023 13:30:39 +0200 Subject: [PATCH 2/6] Commit --- options/locale/locale_en-US.ini | 1 + templates/repo/diff/box.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2109950ca85ca..308c02ddc5482 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1350,6 +1350,7 @@ issues.action_check_all = Check/Uncheck all items issues.opened_by = opened %[1]s by %[3]s pulls.merged_by = by %[3]s was merged %[1]s pulls.merged_by_fake = by %[2]s was merged %[1]s +pulls.new_file_mode = new mode issues.closed_by = by %[3]s was closed %[1]s issues.opened_by_fake = opened %[1]s by %[2]s issues.closed_by_fake = by %[2]s was closed %[1]s diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 3532037abc112..add4189d0aecc 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -106,7 +106,7 @@ {{if and $file.Mode $file.OldMode}} {{$file.Mode}} → {{$file.OldMode}} {{else if $file.Mode}} - new mode → {{$file.Mode}} + {{$.locale.Tr "repo.pulls.new_file_mode"}} → {{$file.Mode}} {{end}}
From df11169450f28e13bf88e190efbf838ec685c51a Mon Sep 17 00:00:00 2001 From: stuzer05 Date: Sun, 26 Feb 2023 13:40:07 +0200 Subject: [PATCH 3/6] Commit --- options/locale/locale_en-US.ini | 3 ++- services/gitdiff/gitdiff.go | 13 +++---------- templates/repo/diff/box.tmpl | 4 ++-- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 308c02ddc5482..ecd3d1467eac3 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1350,7 +1350,8 @@ issues.action_check_all = Check/Uncheck all items issues.opened_by = opened %[1]s by %[3]s pulls.merged_by = by %[3]s was merged %[1]s pulls.merged_by_fake = by %[2]s was merged %[1]s -pulls.new_file_mode = new mode +pulls.new_file_mode = new mode → %[1]s +pulls.changed_file_mode = %[1]s → %[2]s issues.closed_by = by %[3]s was closed %[1]s issues.opened_by_fake = opened %[1]s by %[2]s issues.closed_by_fake = by %[2]s was closed %[1]s diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 0ab2f0d461d05..5dff844df38d4 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -14,7 +14,6 @@ import ( "io" "net/url" "os" - "regexp" "sort" "strings" "time" @@ -582,23 +581,17 @@ parsingLoop: strings.HasPrefix(line, "new mode "): if strings.HasPrefix(line, "old mode ") { - r := regexp.MustCompile(`old mode (\d{6})`) - matched := r.FindStringSubmatch(line) - curFile.OldMode = matched[1] + curFile.OldMode = strings.Replace(line, "old mode ", "", -1) } if strings.HasPrefix(line, "new mode ") { - r := regexp.MustCompile(`new mode (\d{6})`) - matched := r.FindStringSubmatch(line) - curFile.Mode = matched[1] + curFile.Mode = strings.Replace(line, "new mode ", "", -1) } if strings.HasSuffix(line, " 160000\n") { curFile.IsSubmodule = true } case strings.HasPrefix(line, "new file mode "): - r := regexp.MustCompile(`new file mode (\d{6})`) - matched := r.FindStringSubmatch(line) - curFile.Mode = matched[1] + curFile.Mode = strings.Replace(line, "new file mode ", "", -1) case strings.HasPrefix(line, "rename from "): curFile.IsRenamed = true curFile.Type = DiffFileRename diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index add4189d0aecc..a0ff5efad786e 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -104,9 +104,9 @@ {{$.locale.Tr "repo.diff.vendored"}} {{end}} {{if and $file.Mode $file.OldMode}} - {{$file.Mode}} → {{$file.OldMode}} + {{$.locale.Tr "repo.pulls.changed_file_mode" $file.Mode $file.OldMode}} {{else if $file.Mode}} - {{$.locale.Tr "repo.pulls.new_file_mode"}} → {{$file.Mode}} + {{$.locale.Tr "repo.pulls.new_file_mode" $file.Mode}} {{end}}
From 458c2f4e1c5602b5027064ed4dce4fed885dadc8 Mon Sep 17 00:00:00 2001 From: stuzer05 Date: Sun, 26 Feb 2023 13:41:15 +0200 Subject: [PATCH 4/6] Commit --- templates/repo/diff/box.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index a0ff5efad786e..600694e9196e2 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -104,7 +104,7 @@ {{$.locale.Tr "repo.diff.vendored"}} {{end}} {{if and $file.Mode $file.OldMode}} - {{$.locale.Tr "repo.pulls.changed_file_mode" $file.Mode $file.OldMode}} + {{$.locale.Tr "repo.pulls.changed_file_mode" $file.OldMode $file.Mode}} {{else if $file.Mode}} {{$.locale.Tr "repo.pulls.new_file_mode" $file.Mode}} {{end}} From fa44e3fde335ef36cba3b9c8759b602a6b7e765b Mon Sep 17 00:00:00 2001 From: stuzer05 Date: Sun, 26 Feb 2023 13:53:04 +0200 Subject: [PATCH 5/6] Commit --- services/gitdiff/gitdiff.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 5dff844df38d4..9b5b12ec59607 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -581,17 +581,17 @@ parsingLoop: strings.HasPrefix(line, "new mode "): if strings.HasPrefix(line, "old mode ") { - curFile.OldMode = strings.Replace(line, "old mode ", "", -1) + curFile.OldMode = strings.ReplaceAll(line, "old mode ", "") } if strings.HasPrefix(line, "new mode ") { - curFile.Mode = strings.Replace(line, "new mode ", "", -1) + curFile.Mode = strings.ReplaceAll(line, "new mode ", "") } if strings.HasSuffix(line, " 160000\n") { curFile.IsSubmodule = true } case strings.HasPrefix(line, "new file mode "): - curFile.Mode = strings.Replace(line, "new file mode ", "", -1) + curFile.Mode = strings.ReplaceAll(line, "new file mode ", "") case strings.HasPrefix(line, "rename from "): curFile.IsRenamed = true curFile.Type = DiffFileRename From 0ba67babb3698ea35d69ca5ce20c90b13c99e910 Mon Sep 17 00:00:00 2001 From: stuzer05 Date: Sun, 26 Feb 2023 18:24:50 +0200 Subject: [PATCH 6/6] Commit --- options/locale/locale_en-US.ini | 1 - templates/repo/diff/box.tmpl | 2 -- 2 files changed, 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ecd3d1467eac3..577f3e7a2454d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1350,7 +1350,6 @@ issues.action_check_all = Check/Uncheck all items issues.opened_by = opened %[1]s by %[3]s pulls.merged_by = by %[3]s was merged %[1]s pulls.merged_by_fake = by %[2]s was merged %[1]s -pulls.new_file_mode = new mode → %[1]s pulls.changed_file_mode = %[1]s → %[2]s issues.closed_by = by %[3]s was closed %[1]s issues.opened_by_fake = opened %[1]s by %[2]s diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 600694e9196e2..5347a7f49a9bc 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -105,8 +105,6 @@ {{end}} {{if and $file.Mode $file.OldMode}} {{$.locale.Tr "repo.pulls.changed_file_mode" $file.OldMode $file.Mode}} - {{else if $file.Mode}} - {{$.locale.Tr "repo.pulls.new_file_mode" $file.Mode}} {{end}}