Allow compare page to look up base, head, own-fork, forkbase-of-head

[zeripath]

• Offer the head and the base repository branches to be either head or base
• Offer our fork of the base as a head or base
• Offer the fork root of the base as a head or a base
• Change syntax to allow arbitrary {:owner}/{:repo}:{:branch} comparisons
• Allow ... in the user name and repo name - fortunately these are banned from branch names by git.
  *Fix the 500 when comparing without a common history - just display that the PR cannot be made

Related #7759

Signed-off-by: Andrew Thornton [email protected]

Screenshots

Handle ... in usernames and reponames

On the root repo, with a different head proffer our fork

[lunny]

Any screenshot?

[codecov-io]

Codecov Report

Merging #11327 into master will increase coverage by 0.12%.
The diff coverage is 71.00%.

@@            Coverage Diff             @@
##           master   #11327      +/-   ##
==========================================
+ Coverage   43.84%   43.96%   +0.12%     
==========================================
  Files         613      613              
  Lines       87229    87345     +116     
==========================================
+ Hits        38245    38403     +158     
+ Misses      44262    44209      -53     
- Partials     4722     4733      +11     

Impacted Files	Coverage Δ
models/oauth2.go	34.04% <ø> (ø)
modules/git/commit.go	49.84% <ø> (+0.45%)	⬆️
modules/git/repo_compare.go	73.52% <ø> (-0.39%)	⬇️
modules/setting/setting.go	45.53% <50.00%> (ø)
routers/repo/compare.go	45.43% <60.13%> (+3.95%)	⬆️
modules/markup/markdown/goldmark.go	51.92% <86.36%> (+0.36%)	⬆️
models/user.go	51.04% <92.30%> (+1.37%)	⬆️
modules/lfs/server.go	43.01% <92.30%> (+2.65%)	⬆️
modules/markup/sanitizer.go	93.47% <100.00%> (ø)
routers/api/v1/api.go	77.68% <100.00%> (+0.79%)	⬆️
... and 21 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6a02a4f...3e7c347. Read the comment docs.

[guillep2k]

Just an optional nit. LG-TM.

[zeripath]

I think this should be 1.12. it's actually a bug fix really as it applies you to make PRs from the base repo directly rather than going to your fork first.

The compare UI is awful and with the planned diff improvements we should overhaul it too. So I'm marking bug and placing back in 1.12.

[a1012112796]

Another bug about compare view maybe should fix is that compare two branch in different repos which don't have same parent commit. it will make 500 error.

for example:
test_gpg is a branch from another repo. if compare in same repo, will output right messsage:

but if in different repo, 500 error:

log

2020/05/10 14:38:33 ...m.io/xorm/core/db.go:154:QueryContext() [I] [SQL] SELECT `id`, `repo_id`, `type`, `config`, `created_unix` FROM `repo_unit` WHERE (repo_id = ?) [3]
2020/05/10 14:38:33 ...ters/repo/compare.go:410:PrepareCompareDiff() [E] GetDiffRange: Wait: exit status 128
2020/05/10 14:38:33 ...m.io/xorm/core/db.go:154:QueryContext() [I] [SQL] SELECT count(*) FROM `notification` WHERE (user_id = ?) AND (status = ?) [3 1]

[zeripath]

@a1012112796 so that's a different problem - if you can point me to exactly where the problem is I can see if I can hack it into here but it's not going to be in the same function. (I've found it before but can't remember where it was.)

Frankly, the whole compare and diff page needs rewriting. It's a total mess, and the diff infrastructure does absolutely terrible things.

I absolutely want this fix in 1.12 - I cannot refactor diff and get that in 1.12.

---

Edit: I've prevented the 500 now

[a1012112796]

@a1012112796 so that's a different problem - if you can point me to exactly where the problem is I can see if I can hack it into here but it's not going to be in the same function. (I've found it before but can't remember where it was.)

Frankly, the whole compare and diff page needs rewriting. It's a total mess, and the diff infrastructure does absolutely terrible things.

I absolutely want this fix in 1.12 - I cannot refactor diff and get that in 1.12.

I see, So It's okay to leave over this bug, It's not a big promblem. for me, I still expect separate pull request and fork function.which means user can make pull request from two repo which not necessary to have fork relation. the fork is only a fast way to copy repo not precondition to make pull request.

Ah-ha, I'm dreaming again 😅 #11078

[zeripath]

@a1012112796 I've prevented the 500.

[6543]

huge imprufement for pulls :)

[6543]

ping lgtm

[zeripath]

Following on from this pr we'll need to extend the API equivalent to allow for direct reference of repositories - however as they do not actually share a significant code base I think it's ok to do that separately.

Of course, all of these endpoints are convoluted and tortuous and need to be significantly refactored in the next release.