mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-04 05:18:25 +00:00 
			
		
		
		
	Display specific message if diff is not displayed because of too long line (#15611)
* 7184- message if line too long * Update options/locale/locale_en-US.ini Co-authored-by: silverwind <me@silverwind.io> * add flag on missing cases Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
		@@ -1887,6 +1887,7 @@ diff.file_image_width = Width
 | 
			
		||||
diff.file_image_height = Height
 | 
			
		||||
diff.file_byte_size = Size
 | 
			
		||||
diff.file_suppressed = File diff suppressed because it is too large
 | 
			
		||||
diff.file_suppressed_line_too_long = File diff suppressed because one or more lines are too long
 | 
			
		||||
diff.too_many_files = Some files were not shown because too many files changed in this diff
 | 
			
		||||
diff.comment.placeholder = Leave a comment
 | 
			
		||||
diff.comment.markdown_info = Styling with markdown is supported.
 | 
			
		||||
 
 | 
			
		||||
@@ -574,21 +574,22 @@ func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) tem
 | 
			
		||||
 | 
			
		||||
// DiffFile represents a file diff.
 | 
			
		||||
type DiffFile struct {
 | 
			
		||||
	Name               string
 | 
			
		||||
	OldName            string
 | 
			
		||||
	Index              int
 | 
			
		||||
	Addition, Deletion int
 | 
			
		||||
	Type               DiffFileType
 | 
			
		||||
	IsCreated          bool
 | 
			
		||||
	IsDeleted          bool
 | 
			
		||||
	IsBin              bool
 | 
			
		||||
	IsLFSFile          bool
 | 
			
		||||
	IsRenamed          bool
 | 
			
		||||
	IsAmbiguous        bool
 | 
			
		||||
	IsSubmodule        bool
 | 
			
		||||
	Sections           []*DiffSection
 | 
			
		||||
	IsIncomplete       bool
 | 
			
		||||
	IsProtected        bool
 | 
			
		||||
	Name                    string
 | 
			
		||||
	OldName                 string
 | 
			
		||||
	Index                   int
 | 
			
		||||
	Addition, Deletion      int
 | 
			
		||||
	Type                    DiffFileType
 | 
			
		||||
	IsCreated               bool
 | 
			
		||||
	IsDeleted               bool
 | 
			
		||||
	IsBin                   bool
 | 
			
		||||
	IsLFSFile               bool
 | 
			
		||||
	IsRenamed               bool
 | 
			
		||||
	IsAmbiguous             bool
 | 
			
		||||
	IsSubmodule             bool
 | 
			
		||||
	Sections                []*DiffSection
 | 
			
		||||
	IsIncomplete            bool
 | 
			
		||||
	IsIncompleteLineTooLong bool
 | 
			
		||||
	IsProtected             bool
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// GetType returns type of diff file.
 | 
			
		||||
@@ -935,6 +936,7 @@ func parseHunks(curFile *DiffFile, maxLines, maxLineCharacters int, input *bufio
 | 
			
		||||
	for {
 | 
			
		||||
		for isFragment {
 | 
			
		||||
			curFile.IsIncomplete = true
 | 
			
		||||
			curFile.IsIncompleteLineTooLong = true
 | 
			
		||||
			_, isFragment, err = input.ReadLine()
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				// Now by the definition of ReadLine this cannot be io.EOF
 | 
			
		||||
@@ -1062,6 +1064,7 @@ func parseHunks(curFile *DiffFile, maxLines, maxLineCharacters int, input *bufio
 | 
			
		||||
		line := string(lineBytes)
 | 
			
		||||
		if isFragment {
 | 
			
		||||
			curFile.IsIncomplete = true
 | 
			
		||||
			curFile.IsIncompleteLineTooLong = true
 | 
			
		||||
			for isFragment {
 | 
			
		||||
				lineBytes, isFragment, err = input.ReadLine()
 | 
			
		||||
				if err != nil {
 | 
			
		||||
@@ -1073,6 +1076,7 @@ func parseHunks(curFile *DiffFile, maxLines, maxLineCharacters int, input *bufio
 | 
			
		||||
		}
 | 
			
		||||
		if len(line) > maxLineCharacters {
 | 
			
		||||
			curFile.IsIncomplete = true
 | 
			
		||||
			curFile.IsIncompleteLineTooLong = true
 | 
			
		||||
			line = line[:maxLineCharacters]
 | 
			
		||||
		}
 | 
			
		||||
		curSection.Lines[len(curSection.Lines)-1].Content = line
 | 
			
		||||
 
 | 
			
		||||
@@ -53,7 +53,13 @@
 | 
			
		||||
						</div>
 | 
			
		||||
						<span class="file mono">{{$file.Name}}</span>
 | 
			
		||||
						<div class="diff-file-header-actions df ac">
 | 
			
		||||
							<div class="text grey">{{$.i18n.Tr "repo.diff.file_suppressed"}}</div>
 | 
			
		||||
							<div class="text grey">
 | 
			
		||||
								{{if $file.IsIncompleteLineTooLong}}
 | 
			
		||||
									{{$.i18n.Tr "repo.diff.file_suppressed_line_too_long"}}
 | 
			
		||||
								{{else}}
 | 
			
		||||
									{{$.i18n.Tr "repo.diff.file_suppressed"}}
 | 
			
		||||
								{{end}}
 | 
			
		||||
							</div>
 | 
			
		||||
							{{if $file.IsProtected}}
 | 
			
		||||
								<span class="ui basic label">{{$.i18n.Tr "repo.diff.protected"}}</span>
 | 
			
		||||
							{{end}}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user