Skip to content
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

fix calReleaseNumCommitsBehind #24148

Merged
merged 10 commits into from
Apr 18, 2023

Conversation

oliverpool
Copy link
Contributor

@oliverpool oliverpool commented Apr 15, 2023

repoCtx.CommitsCount is not reliably the commit count of the default branch (Repository.GetCommitsCount depends on what is currently displayed).

For instance on the releases page the commit count is correct: https://codeberg.org/Codeberg/pages-server/releases

2023-04-15-215027

However it is not on the single page: https://codeberg.org/Codeberg/pages-server/releases/tag/v4.6.2

2023-04-15-215036

This PR fixes this by removing a "fast branch" which was using this field (I think this field should be removed, since it is a bit unpredictable - but this would mean a larger refactoring PR).

contributed in the context of @forgejo

repoCtx.CommitsCount is not reliably the commit count of the default
branch (see Repository.GetCommitsCount)
@lunny lunny added the type/bug label Apr 16, 2023
@lunny lunny modified the milestones: 1.19.2, 1.20.0 Apr 16, 2023
@lunny lunny added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 16, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 16, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 16, 2023
@oliverpool
Copy link
Contributor Author

oliverpool commented Apr 17, 2023

I added a user2/repo-release with the following git history:

* 7197b56 readme: v2 (HEAD -> main, tag: v2.0)
| 
* 79f9d88 bugfix
| 
* 4380f99 feature v2
|   
| * cef06e4 readme: v1.1 (tag: v1.1)
| | 
| * c4a4e1a bugfix (backported)
|/  
| 
* a8a700e readme: v1 (tag: v1.0, master)
| 
* f3f1c90 readme: title
| 
* 184288e add readme

I added a master branch to please the tests

@oliverpool
Copy link
Contributor Author

Sorry for the previous noise. I think this PR is now complete! (I didn't touch the code, only the tests)

cc @techknowlogick

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 17, 2023
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 18, 2023
@silverwind silverwind merged commit bb27838 into go-gitea:main Apr 18, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 18, 2023
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.19. @oliverpool, please send one manually. 🍵

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Apr 18, 2023
oliverpool added a commit to oliverpool/gitea that referenced this pull request Apr 18, 2023
Backport go-gitea#24148

`repoCtx.CommitsCount` is not reliably the commit count of the default
branch (Repository.GetCommitsCount depends on what is currently
displayed).

_contributed in the context of @forgejo_

---------

Co-authored-by: Giteabot <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
@lunny lunny added the backport/done All backports for this PR have been created label Apr 19, 2023
@oliverpool oliverpool deleted the fix_calReleaseNumCommitsBehind branch April 19, 2023 07:04
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 20, 2023
* giteaofficial/main: (26 commits)
  Make HTML template functions support context (go-gitea#24056)
  Fix issue attachment handling (go-gitea#24202)
  Update JS dependencies (go-gitea#24218)
  Remove most path-based golangci exclusions (go-gitea#24214)
  [skip ci] Updated translations via Crowdin
  Fix internal sever error when visiting a PR that bound to the deleted team (go-gitea#24127)
  Add owner team permission check test (go-gitea#24096)
  Fix incorrect CORS default values (go-gitea#24206)
  Add repository counter badge to repository tab (go-gitea#24205)
  Fix template error in pull request with deleted head repo (go-gitea#24192)
  Make wiki title supports dashes and improve wiki name related features (go-gitea#24143)
  Fix Resolve Conversation not working in Conversation view (go-gitea#24191)
  Vertical widths of containers removed (go-gitea#24184)
  Don't list root repository on compare page if pulls not allowed (go-gitea#24183)
  Add unset default project column (go-gitea#23531)
  Allow adding new files to an empty repo (go-gitea#24164)
  Add runner check in repo action page (go-gitea#24124)
  Use same action status svg icons on actions list as on action page (go-gitea#24178)
  [skip ci] Updated translations via Crowdin
  fix calReleaseNumCommitsBehind (go-gitea#24148)
  ...

# Conflicts:
#	templates/repo/wiki/view.tmpl
silverwind added a commit that referenced this pull request Apr 22, 2023
Backport #24148

`repoCtx.CommitsCount` is not reliably the commit count of the default
branch (Repository.GetCommitsCount depends on what is currently
displayed).

_contributed in the context of @forgejo_

---------

Co-authored-by: Giteabot <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: silverwind <[email protected]>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants