Notify about recent pushes if a branch has no PR yet #14003

kolaente · 2020-12-15T20:43:20Z

This PR adds a nice little message on the dashboard if the current user recently pushed to a branch which has no PR open yet, with a link to do so. If the user recently pushed to a fork, it will show a message as well, but the link will go to create a PR with the upstream repository instead.

This PR explicitly does not show a link to existing PRs after pushes to a branch to keep it simple.

Screenshots

TODO

Make sure it is working for both pushes to a new branch on the same repo and on a fork
Actually show the message on the dashboard
Hide pushes to the default branch since it does not make sense to create PRs for that unless the push was made to a forked repo
Include the time when the push happened in the message
Add a screenshot here

Resolves #311, resolves #13196, resolves #23743

CirnoT · 2020-12-17T20:25:08Z

I'm worried it might be too cluttered when more than few message are displayed (especially with rather long time limit). How about moving it to repo page similar to how GH does it?

lunny · 2020-12-18T04:46:24Z

How about display it in the repository home page but not user's dashboard page. Once the user push to serval repositories, which one should we display?

kolaente · 2020-12-18T16:21:22Z

I'm worried it might be too cluttered when more than few message are displayed (especially with rather long time limit). How about moving it to repo page similar to how GH does it?

@CirnoT I think this could be addressed with either a shorter time limit or limiting the max messages to 2 or 4 (or both)

I think github shows it on both the repo page and the dashboard. IIRC gitlab does that as well.

lunny · 2023-03-29T03:13:31Z

Fix #23743

kolaente · 2023-03-29T08:19:36Z

Would there be interest in picking this PR up again?

lunny · 2023-03-29T08:59:43Z

Maybe it should be on top of the repository home page but not dashboard?

delvh · 2023-03-29T09:35:57Z

The interest is definitely there, but I wonder if it wouldn't make more sense to create a new branch, one to resolve all conflicts that happened in the mean time, and two to give it the attention boost of a new PR?

kolaente · 2023-03-29T11:11:23Z

@delvh Probably. Should I do that or wants someone else pick it up?

delvh

I think it makes sense if you publish the new PR as you're also the author of this one.

Below you find some more things I just noticed.

delvh · 2023-03-29T09:36:53Z

options/locale/locale_en-US.ini

@@ -1381,6 +1381,8 @@ pulls.merge_instruction_hint = `You can also view <a class="show-instruction">co
 pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes.
 pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea.

+pulls.recently_pushed_to_branches = You recently pushed to <strong>%[1]s/%[2]s</strong> on branch <strong>%[3]s</strong>


According to @lunny's suggestion above, this message should then be renamed.

models/action.go

templates/user/recently_pushed_branches.tmpl

models/action.go

# Conflicts: # models/action.go # routers/web/user/home.go

silverwind · 2023-04-07T17:59:40Z

And that's why GitLab dropped other database support, only supports one database -- it's difficult to fine-tune a large dataset on different databases.

That is my impression as well. Single database allows many optimizations and features that just are not possible with multi-database. We might consider it if we can provide migrations, but I think that won't be so easy.

CirnoT · 2023-04-07T18:01:29Z

Also on unrelated note, that query returns for quite weird results:

gitea=# SELECT action.ref_name, action.repo_id, action.created_unix FROM "action" LEFT JOIN "pull_request" ON pull_request.head_branch = replace(action.ref_name, 'refs/heads/', '') LEFT JOIN "issue" ON pull_request.issue_id = issue.id LEFT JOIN "repository" ON action.repo_id = repository.id WHERE action.op_type=5 AND action.act_user_id=32 AND ((repository.default_branch != replace(action.ref_name, 'refs/heads/', '')) OR repository.is_fork=TRUE) AND (pull_request.id IS NULL OR (pull_request.has_merged=FALSE AND issue.is_closed=TRUE AND (action.created_unix > issue.closed_unix))) AND action.created_unix>=1680362902 GROUP BY action.ref_name, action.repo_id, action.created_unix ORDER BY "action"."created_unix" DESC;
               ref_name               | repo_id | created_unix 
--------------------------------------+---------+--------------
 refs/heads/renovate/phpstan-monorepo |       1 |   1680460273
 refs/heads/renovate/phpstan-monorepo |       1 |   1680460272
 refs/heads/renovate/phpstan-monorepo |      13 |   1680460072
 refs/heads/renovate/webpack-5.x      |       6 |   1680459707
 refs/heads/renovate/phpstan-monorepo |       1 |   1680456696
 refs/heads/renovate/phpstan-monorepo |      13 |   1680456540
 refs/heads/renovate/phpstan-monorepo |       9 |   1680456286
 refs/heads/renovate/phpstan-monorepo |       9 |   1680456285

These branches do not exist, Multiple PRs for them exists but they are either merged or closed (unmerged).

lunny · 2023-04-08T08:40:08Z

I think the performance problem could be partially resolved by this approach:
1. Only do a simple select query in action table (no JOIN). Since we only need the recent 2 hour activity record, and action table has indices, the performance should be good enough.

2. Then, use other queries to gather more details.
@lunny what do you think about this?

I think we could also do some optimization at the moment but those are temporary methods. As I said, once branches have been synced into databases, this PR could be implemented very easily. Assume we have a new table branch with an index repo_id and updated timestamp. We can easily get recently updated branch names of this repository or all the branches in this instance. No complex SQL, no Joins.

silverwind · 2023-04-08T08:52:14Z

We could on branch push push all pushed branches into a per-user append-only data structure where values would automatically expire after the 2 hour time period (like redis EXPIRE command).

Then, when rendering, the operation is just a simple retrieval of that list with some filtering for cases where branch was deleted or has an associated PR. The only thing I'm not sure about if auto-expiring keys can be done with SQL, or if that would require a cache like redis.

yardenshoham · 2023-04-08T09:10:49Z

I think GitHub keeps it out of the initial page render. Maybe it can be done in the background with an API call and render the suggestion only when ready?

silverwind · 2023-04-08T09:12:41Z

Yeah, it is definitely async on GitHub which causes ugly JS pop-in. If we can find a performant synchronous solution it would be ideal.

kolaente · 2023-04-10T14:23:20Z

Thanks everyone for your investigations and queries. My goal was to use existing data structures to avoid a higher overhead for such a simple feature. Well, looks like this is not as simple as I thought.

I think we could also do some optimization at the moment but those are temporary methods. As I said, once branches have been synced into databases, this PR could be implemented very easily. Assume we have a new table branch with an index repo_id and updated timestamp. We can easily get recently updated branch names of this repository or all the branches in this instance. No complex SQL, no Joins.

Should this PR be blocked and reworked when the other one got merged?

yardenshoham · 2023-04-10T14:25:39Z

Blocked by Sync branches into databases #22743

yardenshoham · 2023-05-23T19:14:05Z

@techknowlogick why?

techknowlogick · 2023-05-23T19:19:36Z

@yardenshoham caught up in a PR cleanup sweep, thanks for re-opening :)

wxiaoguang · 2023-05-24T02:46:18Z

I think maybe this PR could be taken in 1.20 if no objection for "only querying recent N hours actions records by a single/simple SELECT" ?

If the query range is limited by time and the query is simple, it doesn't seem to cause server side load problem?

silverwind · 2023-05-29T22:03:02Z

Yes, and ideally only show notification on the repo page. Not on the frontpage.

Oh, and it needs to filter out branches that have a associated PR, haven't checked if it already does that.

lunny · 2023-06-30T08:29:18Z

Since #22743 merged, I think this could be continued now.

outdated

silverwind · 2023-06-30T10:16:34Z

As already mentioned, I would like to see this changed to only show on the repo page as it would be too annoying on the frontpage.

kolaente · 2023-07-05T17:21:43Z

I don't really have time to implement this in the next few weeks, so if anyone wants to pick it up, feel free. Otherwise I'll take a stab at it at the end of August / early September.

@kolaente

This PR will display a pull request creation hint on the repository home page when there are newly created branches with no pull request. Only the recent 6 hours and 2 updated branches will be displayed. Inspired by #14003 Replace #14003 Resolves #311 Resolves #13196 Resolves #23743 co-authored by @kolaente

6543 · 2023-07-08T03:19:27Z

#25715

kolaente added 8 commits December 15, 2020 20:17

Add function to get recently pushed branches

b707f36

Fix query

c5dbe71

Add template to show PR message

bedef4e

Merge branch 'master' into feature/pr-prompt

40b2bad

Show message to create a PR

b435472

Filter out pushes to the default branch of repositories

b3686af

Make sure the group by statement works with other DBMSes too

83d3a5f

Add the actual message

6d9e242

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 17, 2020

lunny added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Dec 18, 2020

kolaente added 3 commits February 4, 2021 23:22

Merge branch 'master' into feature/pr-prompt

623c7ce

Merge branch 'master' into feature/pr-prompt

a785aff

Merge branch 'master' into feature/pr-prompt

cb6b6c2

kolaente mentioned this pull request Jul 17, 2021

Plan of Gitea v1.16 #16429

Closed

jpraet mentioned this pull request Mar 27, 2023

Message new Branch(es) are ready to be merged #23743

Closed

delvh reviewed Mar 29, 2023

View reviewed changes

kolaente added 6 commits April 1, 2023 15:30

Merge branch 'main' into feature/pr-prompt

7f5e5d2

# Conflicts: # models/action.go # routers/web/user/home.go

chore: move code to get the recently pushed branches

3f6b989

feat: limit to max 3 recently pushed

1e13689

fix: u.id after rename

a92a6d2

chore: use CompareLink template function to build PR link

b80c8ac

feat: check if the push was to a fork and change the link accordingly

50b52b4

yardenshoham added the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label Apr 10, 2023

yardenshoham self-requested a review May 10, 2023 12:18

GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels May 10, 2023

techknowlogick closed this May 23, 2023

GiteaBot removed this from the 1.20.0 milestone May 23, 2023

yardenshoham reopened this May 23, 2023

pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 23, 2023

yardenshoham removed the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label Jun 30, 2023

lunny mentioned this pull request Jul 6, 2023

Newly pushed branches hints on repository home page #25715

Merged

6543 closed this Jul 8, 2023

go-gitea locked as resolved and limited conversation to collaborators Oct 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Notify about recent pushes if a branch has no PR yet #14003

Notify about recent pushes if a branch has no PR yet #14003

kolaente commented Dec 15, 2020 •

edited

Loading

CirnoT commented Dec 17, 2020

lunny commented Dec 18, 2020

kolaente commented Dec 18, 2020

lunny commented Mar 29, 2023

kolaente commented Mar 29, 2023

lunny commented Mar 29, 2023

delvh commented Mar 29, 2023

kolaente commented Mar 29, 2023

delvh left a comment

delvh Mar 29, 2023

silverwind commented Apr 7, 2023 •

edited

Loading

CirnoT commented Apr 7, 2023

lunny commented Apr 8, 2023

silverwind commented Apr 8, 2023 •

edited

Loading

yardenshoham commented Apr 8, 2023

silverwind commented Apr 8, 2023 •

edited

Loading

kolaente commented Apr 10, 2023

yardenshoham commented Apr 10, 2023

yardenshoham commented May 23, 2023

techknowlogick commented May 23, 2023

wxiaoguang commented May 24, 2023

silverwind commented May 29, 2023 •

edited

Loading

lunny commented Jun 30, 2023

silverwind commented Jun 30, 2023

kolaente commented Jul 5, 2023

6543 commented Jul 8, 2023

Notify about recent pushes if a branch has no PR yet #14003

Notify about recent pushes if a branch has no PR yet #14003

Conversation

kolaente commented Dec 15, 2020 • edited Loading

Screenshots

TODO

CirnoT commented Dec 17, 2020

lunny commented Dec 18, 2020

kolaente commented Dec 18, 2020

lunny commented Mar 29, 2023

kolaente commented Mar 29, 2023

lunny commented Mar 29, 2023

delvh commented Mar 29, 2023

kolaente commented Mar 29, 2023

delvh left a comment

Choose a reason for hiding this comment

delvh Mar 29, 2023

Choose a reason for hiding this comment

silverwind commented Apr 7, 2023 • edited Loading

CirnoT commented Apr 7, 2023

lunny commented Apr 8, 2023

silverwind commented Apr 8, 2023 • edited Loading

yardenshoham commented Apr 8, 2023

silverwind commented Apr 8, 2023 • edited Loading

kolaente commented Apr 10, 2023

yardenshoham commented Apr 10, 2023

yardenshoham commented May 23, 2023

techknowlogick commented May 23, 2023

wxiaoguang commented May 24, 2023

silverwind commented May 29, 2023 • edited Loading

lunny commented Jun 30, 2023

silverwind commented Jun 30, 2023

kolaente commented Jul 5, 2023

6543 commented Jul 8, 2023

kolaente commented Dec 15, 2020 •

edited

Loading

silverwind commented Apr 7, 2023 •

edited

Loading

silverwind commented Apr 8, 2023 •

edited

Loading

silverwind commented Apr 8, 2023 •

edited

Loading

silverwind commented May 29, 2023 •

edited

Loading