-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rewrite compare functions #32786
Draft
lunny
wants to merge
17
commits into
go-gitea:main
Choose a base branch
from
lunny:lunny/refactor_getpatch
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+686
−542
Draft
Rewrite compare functions #32786
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
8eb19a5
Refactor GetDiff/Path functions to let it more flexible
lunny 48b5bab
fix conflict
lunny 283c030
Fix bug
lunny f19b4b7
Refactor Parsing compare path parameters
lunny 4ee5334
Refactor all compare routers
lunny 07abd8d
Merge branch 'main' into lunny/refactor_getpatch
lunny 743fa68
make the code simpler
lunny 72f6e28
Merge branch 'main' into lunny/refactor_getpatch
lunny 52639ff
Fix bug
lunny a3eb356
Add rootRepo and ownForkRepo
lunny a2804a5
Merge branch 'main' into lunny/refactor_getpatch
lunny 743cebe
Some improvements
lunny 050fad9
revert change to fork
lunny 95bccdb
remove unnecessary parameter
lunny 91147db
Fix test
lunny 27b6753
Merge branch 'main' into lunny/refactor_getpatch
lunny 92e68ae
Revert changes related to getpatch/getdiff because they are extracted…
lunny File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,6 +29,17 @@ import ( | |
"github.com/gobwas/glob" | ||
) | ||
|
||
// getDiffOrPatch generates either diff or formatted patch data between given revisions | ||
func getDiffOrPatch(repo *git.Repository, compareString string, w io.Writer, patch, binary bool) error { | ||
if patch { | ||
return repo.GetPatch(compareString, w) | ||
} | ||
if binary { | ||
return repo.GetDiffBinary(compareString, w) | ||
} | ||
return repo.GetDiff(compareString, w) | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is only one call to this function? Maybe it could be removed and just write the if/else in the caller. |
||
|
||
// DownloadDiffOrPatch will write the patch for the pr to the writer | ||
func DownloadDiffOrPatch(ctx context.Context, pr *issues_model.PullRequest, w io.Writer, patch, binary bool) error { | ||
if err := pr.LoadBaseRepo(ctx); err != nil { | ||
|
@@ -42,9 +53,9 @@ func DownloadDiffOrPatch(ctx context.Context, pr *issues_model.PullRequest, w io | |
} | ||
defer closer.Close() | ||
|
||
if err := gitRepo.GetDiffOrPatch(pr.MergeBase, pr.GetGitRefName(), w, patch, binary); err != nil { | ||
log.Error("Unable to get patch file from %s to %s in %s Error: %v", pr.MergeBase, pr.HeadBranch, pr.BaseRepo.FullName(), err) | ||
return fmt.Errorf("Unable to get patch file from %s to %s in %s Error: %w", pr.MergeBase, pr.HeadBranch, pr.BaseRepo.FullName(), err) | ||
if err := getDiffOrPatch(gitRepo, pr.MergeBase+"..."+pr.GetGitRefName(), w, patch, binary); err != nil { | ||
log.Error("unable to get patch file from %s to %s in %s Error: %v", pr.MergeBase, pr.HeadBranch, pr.BaseRepo.FullName(), err) | ||
return fmt.Errorf("unable to get patch file from %s to %s in %s Error: %w", pr.MergeBase, pr.HeadBranch, pr.BaseRepo.FullName(), err) | ||
} | ||
return nil | ||
} | ||
|
@@ -355,7 +366,7 @@ func checkConflicts(ctx context.Context, pr *issues_model.PullRequest, gitRepo * | |
_ = util.Remove(tmpPatchFile.Name()) | ||
}() | ||
|
||
if err := gitRepo.GetDiffBinary(pr.MergeBase, "tracking", tmpPatchFile); err != nil { | ||
if err := gitRepo.GetDiffBinary(pr.MergeBase+"...tracking", tmpPatchFile); err != nil { | ||
tmpPatchFile.Close() | ||
log.Error("Unable to get patch file from %s to %s in %s Error: %v", pr.MergeBase, pr.HeadBranch, pr.BaseRepo.FullName(), err) | ||
return false, fmt.Errorf("unable to get patch file from %s to %s in %s Error: %w", pr.MergeBase, pr.HeadBranch, pr.BaseRepo.FullName(), err) | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove unused function.