Merge branch 'feat-32257-add-comments-unchanged-lines-and-show' of github.com:rajesh-jonnalagadda/gitea into feat-32257-add-comments-unchanged-lines-and-show

Author: rajesh-jonnalagadda

.eslintrc.yaml

@@ -818,7 +818,7 @@ rules:
   unicorn/consistent-destructuring: [2]
   unicorn/consistent-empty-array-spread: [2]
   unicorn/consistent-existence-index-check: [0]
-  unicorn/consistent-function-scoping: [2]
+  unicorn/consistent-function-scoping: [0]
   unicorn/custom-error-definition: [0]
   unicorn/empty-brace-spaces: [2]
   unicorn/error-message: [0]

.gitignore

@@ -28,7 +28,7 @@ _testmain.go
 *.exe
 *.test
 *.prof
-*.tsbuildInfo
+*.tsbuildinfo
 
 *coverage.out
 coverage.all

CHANGELOG.md

@@ -223,7 +223,7 @@ func Push(ctx context.Context, repoPath string, opts PushOptions) error {
 	if err != nil {
 		if strings.Contains(stderr, "non-fast-forward") {
 			return &ErrPushOutOfDate{StdOut: stdout, StdErr: stderr, Err: err}
-		} else if strings.Contains(stderr, "! [remote rejected]") {
+		} else if strings.Contains(stderr, "! [remote rejected]") || strings.Contains(stderr, "! [rejected]") {
 			err := &ErrPushRejected{StdOut: stdout, StdErr: stderr, Err: err}
 			err.GenerateMessage()
 			return err

modules/git/repo.go

@@ -42,6 +42,7 @@ func NewFuncMap() template.FuncMap {
 		"HTMLFormat":   htmlutil.HTMLFormat,
 		"HTMLEscape":   htmlEscape,
 		"QueryEscape":  queryEscape,
+		"QueryBuild":   queryBuild,
 		"JSEscape":     jsEscapeSafe,
 		"SanitizeHTML": SanitizeHTML,
 		"URLJoin":      util.URLJoin,
@@ -293,6 +294,69 @@ func timeEstimateString(timeSec any) string {
 	return util.TimeEstimateString(v)
 }
 
+func queryBuild(a ...any) template.URL {
+	var s string
+	if len(a)%2 == 1 {
+		if v, ok := a[0].(string); ok {
+			if v == "" || (v[0] != '?' && v[0] != '&') {
+				panic("queryBuild: invalid argument")
+			}
+			s = v
+		} else if v, ok := a[0].(template.URL); ok {
+			s = string(v)
+		} else {
+			panic("queryBuild: invalid argument")
+		}
+	}
+	for i := len(a) % 2; i < len(a); i += 2 {
+		k, ok := a[i].(string)
+		if !ok {
+			panic("queryBuild: invalid argument")
+		}
+		var v string
+		if va, ok := a[i+1].(string); ok {
+			v = va
+		} else if a[i+1] != nil {
+			v = fmt.Sprint(a[i+1])
+		}
+		// pos1 to pos2 is the "k=v&" part, "&" is optional
+		pos1 := strings.Index(s, "&"+k+"=")
+		if pos1 != -1 {
+			pos1++
+		} else {
+			pos1 = strings.Index(s, "?"+k+"=")
+			if pos1 != -1 {
+				pos1++
+			} else if strings.HasPrefix(s, k+"=") {
+				pos1 = 0
+			}
+		}
+		pos2 := len(s)
+		if pos1 == -1 {
+			pos1 = len(s)
+		} else {
+			pos2 = pos1 + 1
+			for pos2 < len(s) && s[pos2-1] != '&' {
+				pos2++
+			}
+		}
+		if v != "" {
+			sep := ""
+			hasPrefixSep := pos1 == 0 || (pos1 <= len(s) && (s[pos1-1] == '?' || s[pos1-1] == '&'))
+			if !hasPrefixSep {
+				sep = "&"
+			}
+			s = s[:pos1] + sep + k + "=" + url.QueryEscape(v) + "&" + s[pos2:]
+		} else {
+			s = s[:pos1] + s[pos2:]
+		}
+	}
+	if s != "" && s != "&" && s[len(s)-1] == '&' {
+		s = s[:len(s)-1]
+	}
+	return template.URL(s)
+}
+
 func panicIfDevOrTesting() {
 	if !setting.IsProd || setting.IsInTesting {
 		panic("legacy template functions are for backward compatibility only, do not use them in new code")

modules/templates/helper.go

@@ -29,7 +29,7 @@ CASS.ini
 *.gzlc
 
 ## gitignore reference sites
-# https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files
+# https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#_ignoring
 # https://git-scm.com/docs/gitignore
 # https://help.github.com/articles/ignoring-files/
 

options/gitignore/Alteryx

@@ -0,0 +1,62 @@
+# gitignore template for ECU-TEST workspaces - by TraceTronic https://tracetronic.com
+# website: https://www.ecu-test.com
+#   * all directories are related to the default directories, please adapt the .gitignore if you use customized
+#     directories
+
+# Dynamic workspace settings
+#   * We don't recommend to ignore the .workspace directory, because of important project specific settings
+# local user settings
+.workspace/ETdrive.xml
+.workspace/favorites.xml
+.workspace/filters.xml
+.workspace/generators.xml
+.workspace/history.xml
+.workspace/parallelExecution.xml
+.workspace/signalviewer.xml
+.workspace/signalViewerHistory.json
+.workspace/signalviewer2layout.xml
+.workspace/testeditor.xml
+.workspace/tooladapter.xml
+.workspace/view.xml
+# optional, if your process depends on this file remove exclusion
+.workspace/interactiveexecution.xml
+.workspace/pythonlibrary.xml
+# deprecated, support for older versions
+.workspace/traceexplorer.xml
+
+# Custom file formats and test dependencies
+#  * you can manage your artifacts also with TEST-GUIDE (https://www.test-guide.info) and reference them via Playbooks
+*.arxml
+*.a2l
+*.dbc
+*.hex
+*.s19
+[tT]estdata
+[tT]estdaten
+
+# Test results and test execution related content
+#   * Git is not intended to store and provide test results for all iterations
+#   * We recommend to use TEST-GUIDE (https://www.test-guide.info) for the test report management
+TestReports
+
+# Report generators and templates
+#  * if you want to provide (f.e.) your own report generators exclude the directory here and ignore only the
+#    unnecessary subdirectories
+Templates
+
+# Exclude large binary artifacts
+#  * you can manage your artifacts also with TEST-GUIDE (https://www.test-guide.info) and reference them via Playbooks
+Offline-FIUs
+Offline-Models
+Offline-SGBDs
+*.exe
+*.msi
+*.zip
+*.7z
+
+# Exclude default and custom temporary directories
+Backup_*
+
+# Python bytecode and cache files
+__pycache__/
+*.py[cod]

options/gitignore/ECU-TEST

@@ -22,3 +22,6 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*
+
+# Kotlin Gradle plugin data, see https://kotlinlang.org/docs/whatsnew20.html#new-directory-for-kotlin-data-in-gradle-projects
+.kotlin/

options/gitignore/Kotlin

@@ -21,3 +21,10 @@ Homestead.yaml
 Homestead.json
 /.vagrant
 .phpunit.result.cache
+
+/public/build
+/storage/pail
+.env.backup
+.env.production
+.phpactor.json
+auth.json

options/gitignore/Laravel

@@ -0,0 +1,6 @@
+# Generated by Move
+# will have compiled files
+build/
+
+# Remove possibly saving credentials to the git repository
+.aptos/