File history for renamed files, with '--follow' equivalent to show the complete history #34686
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -205,22 +205,29 @@ func (repo *Repository) FileChangedBetweenCommits(filename, id1, id2 string) (bo | |
| } | ||
|
|
||
| // FileCommitsCount return the number of files at a revision | ||
| func (repo *Repository) FileCommitsCount(revision, file string, followRename ...bool) (int64, error) { | ||
| _followRename := false | ||
| if len(followRename) > 0 { | ||
| _followRename = followRename[0] | ||
| } | ||
|
|
||
| return CommitsCount(repo.Ctx, | ||
| CommitsCountOptions{ | ||
| RepoPath: repo.Path, | ||
| Revision: []string{revision}, | ||
| RelPath: []string{file}, | ||
| FollowRename: _followRename, | ||
| }) | ||
| } | ||
|
|
||
| type CommitsByFileAndRangeOptions struct { | ||
| Revision string | ||
| File string | ||
| Not string | ||
| Page int | ||
| Since string | ||
| Until string | ||
| FollowRename bool | ||
| } | ||
|
|
||
| // CommitsByFileAndRange return the commits according revision file and the page | ||
|
|
@@ -232,9 +239,13 @@ func (repo *Repository) CommitsByFileAndRange(opts CommitsByFileAndRangeOptions) | |
| }() | ||
| go func() { | ||
| stderr := strings.Builder{} | ||
| gitCmd := NewCommand("--no-pager", "log"). | ||
| AddOptionFormat("--pretty=format:%%H"). | ||
| AddOptionFormat("--max-count=%d", setting.Git.CommitsRangeSize). | ||
| AddOptionFormat("--skip=%d", (opts.Page-1)*setting.Git.CommitsRangeSize) | ||
| if opts.FollowRename { | ||
| gitCmd.AddOptionValues("--follow") | ||
| } | ||
| gitCmd.AddDynamicArguments(opts.Revision) | ||
|
|
||
| if opts.Not != "" { | ||
|
|
@@ -253,7 +264,7 @@ func (repo *Repository) CommitsByFileAndRange(opts CommitsByFileAndRangeOptions) | |
| Stdout: stdoutWriter, | ||
| Stderr: &stderr, | ||
| }) | ||
| if err != nil && err != io.ErrUnexpectedEOF { | ||
|
There was a problem hiding this comment. Why checking There was a problem hiding this comment. git log --pretty=format:%H output lacks a newline at the end, whereas git rev-list doesn't. So that's the fix I found to avoid error 500, please tell me if something better is needed. There was a problem hiding this comment. I don't think ErrUnexpectedEOF is right, ErrUnexpectedEOF only means something wrong happens, so it needs a clear fix. There was a problem hiding this comment. I guess the core issue is in modules/git/repo_commit.go:279-281 : length := objectFormat.FullLength()
commits := []*Commit{}
shaline := make([]byte, length+1)From what I understand, shaline is expected to have a length of the hash's length + 1, presumably for the newline. So at line 283 (
There was a problem hiding this comment. @wxiaoguang So, do I need to change something, or ErrUnexpectedEOF is fine ? |
||
| _ = stdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String())) | ||
| } else { | ||
| _ = stdoutWriter.Close() | ||
|
|
@@ -270,7 +281,7 @@ func (repo *Repository) CommitsByFileAndRange(opts CommitsByFileAndRangeOptions) | |
| shaline := make([]byte, length+1) | ||
| for { | ||
| n, err := io.ReadFull(stdoutReader, shaline) | ||
| if (err != nil && err != io.ErrUnexpectedEOF) || n < length { | ||
| if err == io.EOF { | ||
| err = nil | ||
| } | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.