mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 02:46:04 +01:00 
			
		
		
		
	* Allow compare page to look up base, head, own-fork, forkbase-of-head Signed-off-by: Andrew Thornton <art27@cantab.net> * as per @guillep2k Signed-off-by: Andrew Thornton <art27@cantab.net> * Update routers/repo/compare.go * as per @guillep2k Signed-off-by: Andrew Thornton <art27@cantab.net> * Rationalise the names a little Signed-off-by: Andrew Thornton <art27@cantab.net> * Rationalise the names a little (2) Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix 500 with fork of fork Signed-off-by: Andrew Thornton <art27@cantab.net> * Prevent 500 on compare different trees Signed-off-by: Andrew Thornton <art27@cantab.net> * dotdotdot is perfectly valid in both usernames and repo names Signed-off-by: Andrew Thornton <art27@cantab.net> * ensure we can set the head and base repos too Signed-off-by: Andrew Thornton <art27@cantab.net> * ensure we can set the head and base repos too (2) Signed-off-by: Andrew Thornton <art27@cantab.net> * fix lint Signed-off-by: Andrew Thornton <art27@cantab.net> * only set headRepo == baseRepo if isSameRepo Signed-off-by: Andrew Thornton <art27@cantab.net>
		
			
				
	
	
		
			120 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			120 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2015 The Gogs Authors. All rights reserved.
 | |
| // Copyright 2019 The Gitea Authors. All rights reserved.
 | |
| // Use of this source code is governed by a MIT-style
 | |
| // license that can be found in the LICENSE file.
 | |
| 
 | |
| package git
 | |
| 
 | |
| import (
 | |
| 	"container/list"
 | |
| 	"fmt"
 | |
| 	"io"
 | |
| 	"strconv"
 | |
| 	"strings"
 | |
| 	"time"
 | |
| 
 | |
| 	logger "code.gitea.io/gitea/modules/log"
 | |
| )
 | |
| 
 | |
| // CompareInfo represents needed information for comparing references.
 | |
| type CompareInfo struct {
 | |
| 	MergeBase string
 | |
| 	Commits   *list.List
 | |
| 	NumFiles  int
 | |
| }
 | |
| 
 | |
| // GetMergeBase checks and returns merge base of two branches and the reference used as base.
 | |
| func (repo *Repository) GetMergeBase(tmpRemote string, base, head string) (string, string, error) {
 | |
| 	if tmpRemote == "" {
 | |
| 		tmpRemote = "origin"
 | |
| 	}
 | |
| 
 | |
| 	if tmpRemote != "origin" {
 | |
| 		tmpBaseName := "refs/remotes/" + tmpRemote + "/tmp_" + base
 | |
| 		// Fetch commit into a temporary branch in order to be able to handle commits and tags
 | |
| 		_, err := NewCommand("fetch", tmpRemote, base+":"+tmpBaseName).RunInDir(repo.Path)
 | |
| 		if err == nil {
 | |
| 			base = tmpBaseName
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	stdout, err := NewCommand("merge-base", "--", base, head).RunInDir(repo.Path)
 | |
| 	return strings.TrimSpace(stdout), base, err
 | |
| }
 | |
| 
 | |
| // GetCompareInfo generates and returns compare information between base and head branches of repositories.
 | |
| func (repo *Repository) GetCompareInfo(basePath, baseBranch, headBranch string) (_ *CompareInfo, err error) {
 | |
| 	var (
 | |
| 		remoteBranch string
 | |
| 		tmpRemote    string
 | |
| 	)
 | |
| 
 | |
| 	// We don't need a temporary remote for same repository.
 | |
| 	if repo.Path != basePath {
 | |
| 		// Add a temporary remote
 | |
| 		tmpRemote = strconv.FormatInt(time.Now().UnixNano(), 10)
 | |
| 		if err = repo.AddRemote(tmpRemote, basePath, false); err != nil {
 | |
| 			return nil, fmt.Errorf("AddRemote: %v", err)
 | |
| 		}
 | |
| 		defer func() {
 | |
| 			if err := repo.RemoveRemote(tmpRemote); err != nil {
 | |
| 				logger.Error("GetPullRequestInfo: RemoveRemote: %v", err)
 | |
| 			}
 | |
| 		}()
 | |
| 	}
 | |
| 
 | |
| 	compareInfo := new(CompareInfo)
 | |
| 	compareInfo.MergeBase, remoteBranch, err = repo.GetMergeBase(tmpRemote, baseBranch, headBranch)
 | |
| 	if err == nil {
 | |
| 		// We have a common base
 | |
| 		logs, err := NewCommand("log", compareInfo.MergeBase+"..."+headBranch, prettyLogFormat).RunInDirBytes(repo.Path)
 | |
| 		if err != nil {
 | |
| 			return nil, err
 | |
| 		}
 | |
| 		compareInfo.Commits, err = repo.parsePrettyFormatLogToList(logs)
 | |
| 		if err != nil {
 | |
| 			return nil, fmt.Errorf("parsePrettyFormatLogToList: %v", err)
 | |
| 		}
 | |
| 	} else {
 | |
| 		compareInfo.Commits = list.New()
 | |
| 		compareInfo.MergeBase, err = GetFullCommitID(repo.Path, remoteBranch)
 | |
| 		if err != nil {
 | |
| 			compareInfo.MergeBase = remoteBranch
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	// Count number of changed files.
 | |
| 	stdout, err := NewCommand("diff", "--name-only", remoteBranch+"..."+headBranch).RunInDir(repo.Path)
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	compareInfo.NumFiles = len(strings.Split(stdout, "\n")) - 1
 | |
| 	return compareInfo, nil
 | |
| }
 | |
| 
 | |
| // GetDiffOrPatch generates either diff or formatted patch data between given revisions
 | |
| func (repo *Repository) GetDiffOrPatch(base, head string, w io.Writer, formatted bool) error {
 | |
| 	if formatted {
 | |
| 		return repo.GetPatch(base, head, w)
 | |
| 	}
 | |
| 	return repo.GetDiff(base, head, w)
 | |
| }
 | |
| 
 | |
| // GetDiff generates and returns patch data between given revisions.
 | |
| func (repo *Repository) GetDiff(base, head string, w io.Writer) error {
 | |
| 	return NewCommand("diff", "-p", "--binary", base, head).
 | |
| 		RunInDirPipeline(repo.Path, w, nil)
 | |
| }
 | |
| 
 | |
| // GetPatch generates and returns format-patch data between given revisions.
 | |
| func (repo *Repository) GetPatch(base, head string, w io.Writer) error {
 | |
| 	return NewCommand("format-patch", "--binary", "--stdout", base+"..."+head).
 | |
| 		RunInDirPipeline(repo.Path, w, nil)
 | |
| }
 | |
| 
 | |
| // GetDiffFromMergeBase generates and return patch data from merge base to head
 | |
| func (repo *Repository) GetDiffFromMergeBase(base, head string, w io.Writer) error {
 | |
| 	return NewCommand("diff", "-p", "--binary", base+"..."+head).
 | |
| 		RunInDirPipeline(repo.Path, w, nil)
 | |
| }
 |