-
-
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.
Draft
Rewrite compare functions #32786
+686
−542
Conversation
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
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Dec 10, 2024
pull-request-size
bot
added
the
size/L
Denotes a PR that changes 100-499 lines, ignoring generated files.
label
Dec 10, 2024
lunny
commented
Dec 10, 2024
modules/git/repo_compare.go
Outdated
@@ -329,21 +320,6 @@ func (repo *Repository) GetFilesChangedBetween(base, head string) ([]string, err | |||
return split, err | |||
} | |||
|
|||
// GetDiffFromMergeBase generates and return patch data from merge base to head |
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.
wxiaoguang
reviewed
Dec 10, 2024
services/pull/patch.go
Outdated
Comment on lines
32
to
41
// 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 comment
The 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.
pull-request-size
bot
added
size/XXL
Denotes a PR that changes 1000+ lines, ignoring generated files.
and removed
size/L
Denotes a PR that changes 100-499 lines, ignoring generated files.
labels
Dec 11, 2024
github-actions
bot
added
the
modifies/api
This PR adds API routes or modifies them
label
Dec 11, 2024
lunny
changed the title
Refactor GetDiff/Path functions to let it more flexible
Refactor Compare functions and GetDiff/Path functions to let it more flexible
Dec 12, 2024
lunny
changed the title
Refactor Compare functions and GetDiff/Path functions to let it more flexible
Rewrite compare functions
Dec 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
modifies/api
This PR adds API routes or modifies them
modifies/go
Pull requests that update Go code
size/XXL
Denotes a PR that changes 1000+ lines, ignoring generated files.
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.
No description provided.