Add .diff and .patch support to compare #34433
Open
Conversation
This file contains hidden or 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
github-actions
bot
added
modifies/api
|
Some things in my mind:
|
badhezi
force-pushed
the
dev/hezi/add-raw-diff-patch
branch
from
3acbb9f to
bc79694
Compare
github-actions
bot
added
the
modifies/templates
wxiaoguang
reviewed
May 14, 2025
wxiaoguang
reviewed
May 14, 2025
badhezi
force-pushed
the
dev/hezi/add-raw-diff-patch
branch
from
d67ae3a to
afae382
Compare
badhezi
force-pushed
the
dev/hezi/add-raw-diff-patch
branch
from
afae382 to
c80f0b9
Compare
|
@wxiaoguang |
wxiaoguang
reviewed
Jun 1, 2025
routers/web/repo/compare.go
Outdated
| @@ -265,7 +263,8 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo { | |||
| } | |||
| return nil | |||
| } | |||
| ci.HeadBranch = headInfos[1] | |||
| // FIXME: how to correctly choose the head repository? The logic below (3-8) is quite complex, the real head repo is determined there | |||
There was a problem hiding this comment.
When trying to understand the logic, I find something strange, so I left a FIXME here.
Do you have ideas?
There was a problem hiding this comment.
ps: if it is too complex and we don't really need to support these cases, we can also skip the diff/patch support for these cases and leave some comments.
There was a problem hiding this comment.
I'll address that, I prefer to support all use cases
There was a problem hiding this comment.
@wxiaoguang is it clearer now?
I think i covered all use cases with integration tests as well, you think there is any other case we need to cover?
There was a problem hiding this comment.
I don't think so.
- The new logic is inconsistent with the steps 3-8 below. The "headRepo" guess is quite complex.
- I do not think GetRepoRawDiffForFile would work for different base&head repositories, for example:
ref1...headRepo:ref2, but what if ref1 only exists in base repo and ref2 only exists in head repo?
lunny
reviewed
Jun 19, 2025
| err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch, ci.RawDiffType, "", ctx.Resp) | ||
| if err != nil { | ||
| ctx.ServerError("GetRepoRawDiffForFile", err) | ||
| return |
lunny
reviewed
Jun 19, 2025
| session := loginUser(t, user1.Name) | ||
|
|
||
| r, _ := gitrepo.OpenRepository(db.DefaultContext, repo) | ||
|
|
|
If the from commit message is other languages with utf8. Is that right?
|
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Implements proposal #34410
