|
|
|
|
@@ -110,7 +110,7 @@ func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) (*list
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// add commiters if present in search query
|
|
|
|
|
// add committers if present in search query
|
|
|
|
|
if len(opts.Committers) > 0 {
|
|
|
|
|
for _, v := range opts.Committers {
|
|
|
|
|
args = append(args, "--committer="+v)
|
|
|
|
|
@@ -150,7 +150,7 @@ func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) (*list
|
|
|
|
|
stdout = append(stdout, '\n')
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// if there are any keywords (ie not commiter:, author:, time:)
|
|
|
|
|
// if there are any keywords (ie not committer:, author:, time:)
|
|
|
|
|
// then let's iterate over them
|
|
|
|
|
if len(opts.Keywords) > 0 {
|
|
|
|
|
for _, v := range opts.Keywords {
|
|
|
|
|
@@ -195,12 +195,12 @@ func (repo *Repository) FileChangedBetweenCommits(filename, id1, id2 string) (bo
|
|
|
|
|
return len(strings.TrimSpace(string(stdout))) > 0, nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// FileCommitsCount return the number of files at a revison
|
|
|
|
|
// FileCommitsCount return the number of files at a revision
|
|
|
|
|
func (repo *Repository) FileCommitsCount(revision, file string) (int64, error) {
|
|
|
|
|
return CommitsCountFiles(repo.Path, []string{revision}, []string{file})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// CommitsByFileAndRange return the commits according revison file and the page
|
|
|
|
|
// CommitsByFileAndRange return the commits according revision file and the page
|
|
|
|
|
func (repo *Repository) CommitsByFileAndRange(revision, file string, page int) (*list.List, error) {
|
|
|
|
|
skip := (page - 1) * setting.Git.CommitsRangeSize
|
|
|
|
|
|
|
|
|
|
@@ -240,7 +240,7 @@ func (repo *Repository) CommitsByFileAndRange(revision, file string, page int) (
|
|
|
|
|
return repo.parsePrettyFormatLogToList(stdout)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// CommitsByFileAndRangeNoFollow return the commits according revison file and the page
|
|
|
|
|
// CommitsByFileAndRangeNoFollow return the commits according revision file and the page
|
|
|
|
|
func (repo *Repository) CommitsByFileAndRangeNoFollow(revision, file string, page int) (*list.List, error) {
|
|
|
|
|
stdout, err := NewCommand("log", revision, "--skip="+strconv.Itoa((page-1)*50),
|
|
|
|
|
"--max-count="+strconv.Itoa(setting.Git.CommitsRangeSize), prettyLogFormat, "--", file).RunInDirBytes(repo.Path)
|
|
|
|
|
|