[Branch View] manual merge tag #7979

6543 · 2019-08-25T22:00:33Z

(#7976) Show Merge Tag if it is merged manualy

UI:

lafriks · 2019-08-26T00:04:01Z

Imho this should be checked on push and saved to pr

6543 · 2019-08-26T00:06:14Z

Imho this should be checked on push and saved to pr

I dont understand? What do you mean?

lafriks · 2019-08-26T00:07:56Z

Imho this should be checked on push and saved to pr

I dont understand? What do you mean?

Nevermind, it's late I thought it is about PRs manual merge displaying :)

6543 · 2019-08-26T16:44:36Z

do it the short way ... #7976 (comment)

codecov-io · 2019-08-26T16:46:50Z

Codecov Report

Merging #7979 into master will increase coverage by 0.01%.
The diff coverage is 40%.

@@            Coverage Diff             @@
##           master    #7979      +/-   ##
==========================================
+ Coverage   41.79%   41.81%   +0.01%     
==========================================
  Files         497      497              
  Lines       65603    65608       +5     
==========================================
+ Hits        27420    27434      +14     
+ Misses      34667    34659       -8     
+ Partials     3516     3515       -1

Impacted Files	Coverage Δ
routers/repo/branch.go	`55.23% <40%> (-0.38%)`	⬇️
models/repo_list.go	`74.14% <0%> (+0.97%)`	⬆️
models/repo_indexer.go	`70.15% <0%> (+1.93%)`	⬆️
modules/process/manager.go	`81.15% <0%> (+4.34%)`	⬆️
models/unit.go	`67.56% <0%> (+5.4%)`	⬆️

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 8a82850...99c8ab0. Read the comment docs.

6543 · 2019-08-29T14:22:00Z

@lafriks can you review it?

gary-kim

Just to ask, is this also going to indicate a branch is merged if the branch was just created and pushed from the master branch?

options/locale/locale_en-US.ini

6543 · 2019-09-01T09:51:03Z

Just to ask, is this also going to indicate a branch is merged if the branch was just created and pushed from the master branch?

It does. -> #7976 (comment)

gary-kim · 2019-09-01T10:46:08Z

Just to ask, is this also going to indicate a branch is merged if the branch was just created and pushed from the master branch?

It does. -> #7976 (comment)

IMHO, having those branches that have no commits ahead of the master being called merged seems a bit weird as it could also mean that the branch was just created. That may cause some confusion.

6543 · 2019-09-03T14:05:03Z

we can check if it is at least one commit behind the default one to avoid souch or if it doesnt use to mouch cpu time lookup the merge commit

lunny · 2019-09-03T16:02:30Z

We also could detect if the second commit of the branch is not the second one of the default branch.

6543 · 2019-09-03T20:07:59Z

We also could detect if the second commit of the branch is not the second one of the default branch.

nice idear this would save lookup time and works with a lot of constructs ...
but if something is merged without --no-ff and no commits betwen it will not show up as merged ...
but i personaly have no problem with that :D

current_branch.comit.parentcommit == current_branch.comit.parentcommit -> branch merged = false ??

6543 · 2019-09-05T23:53:22Z

We also could detect if the second commit of the branch is not the second one of the default branch.

current_branch.comit.parentcommit == current_branch.comit.parentcommit -> branch merged = false ??

to test if divergence.Behind != 0 should have the same impact?

because if branch is 0 Ahead the only way bouth parent commits are the same is that it is also 0 commits behind ...

if: * no commits ahead default branch * not same as default branch

6543 · 2019-10-05T20:55:25Z

I cleanup the 22 commits so it is easy to understand - the actual diff is very smal ...

6543 · 2019-10-05T21:12:49Z

Actual State:

manual merge tag if:

no commits ahead default branch
not same as default branch

UI:

6543 · 2019-10-05T21:56:55Z

thx now its ready to merge 🚀

EDIT: there is a merge frees for now? (release)

routers/repo/branch.go

6543

@lunny changed it ...

routers/repo/branch.go

lunny · 2019-10-06T01:19:28Z

routers/repo/branch.go

@@ -203,10 +204,16 @@ func loadBranches(ctx *context.Context) []*Branch {
 			}
 		}

+		isMerged := false
+		if divergence.Ahead == 0 && divergence.Behind > 0 && ctx.Repo.Repository.DefaultBranch != branchName {


And I thought it again, maybe divergence.Behind > 0 should be divergence.Behind >= 0? Consider a branch just merged to master and no new commits pushed to master.

but this also let branches who are clones of default-branch show up as "merged":

git checkout -b testbranch origin/master git push -u origin testbranch

6543 · 2019-10-06T01:59:55Z

Close thiss issue because of brainstorm with lunny

...
lunny:
So Is it possible to know it's a cloned branch or a merged branch?
...
6543:
as far as i know there is no way cou can be sure
...
6543:
i got an idear but this will add a fourth lable to the branch view
if we dont calle it "manualy merged" but "included"
...

6543 mentioned this pull request Aug 25, 2019

[Branch View] show "Included" Tag if it is merged manualy or Cloned from default branch #7976

Closed

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 26, 2019

6543 changed the title ~~[Branch View] [WIP] manual merge tag~~ [Branch View] manual merge tag Aug 26, 2019

6543 mentioned this pull request Aug 26, 2019

[Branch View] some enhancements #7454

Closed

14 tasks

lunny added the type/enhancement An improvement of existing functionality label Aug 27, 2019

lunny approved these changes Aug 27, 2019

View reviewed changes

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 Aug 27, 2019

gary-kim suggested changes Sep 1, 2019

View reviewed changes

options/locale/locale_en-US.ini Outdated Show resolved Hide resolved

6543 changed the title ~~[Branch View] manual merge tag~~ [WIP] [Branch View] manual merge tag Sep 3, 2019

6543 changed the title ~~[WIP] [Branch View] manual merge tag~~ [Branch View] manual merge tag Sep 6, 2019

6543 changed the title ~~[Branch View] manual merge tag~~ [WIP] [Branch View] manual merge tag Sep 18, 2019

manual merge tag ...

8f80f3e

if: * no commits ahead default branch * not same as default branch

6543 force-pushed the branch-view-manual-merge-tage branch from 1be6cc9 to 8f80f3e Compare October 5, 2019 20:53

6543 changed the title ~~[WIP] [Branch View] manual merge tag~~ [Branch View] manual merge tag Oct 5, 2019

guillep2k approved these changes Oct 5, 2019

View reviewed changes

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 Oct 5, 2019

gary-kim approved these changes Oct 6, 2019

View reviewed changes

lunny requested changes Oct 6, 2019

View reviewed changes

routers/repo/branch.go Outdated Show resolved Hide resolved

infert check algo

2c97951

6543 commented Oct 6, 2019

View reviewed changes

routers/repo/branch.go Outdated Show resolved Hide resolved

gofmt

99c8ab0

6543 requested a review from lunny October 6, 2019 01:01

lunny reviewed Oct 6, 2019

View reviewed changes

lunny added this to the 1.10.0 milestone Oct 6, 2019

6543 closed this Oct 6, 2019

lunny removed this from the 1.10.0 milestone Oct 6, 2019

6543 mentioned this pull request Oct 10, 2019

[Branch View] Add Included TAG #8449

Merged

6543 deleted the branch-view-manual-merge-tage branch October 10, 2019 02:48

go-gitea locked and limited conversation to collaborators Nov 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Branch View] manual merge tag #7979

[Branch View] manual merge tag #7979

6543 commented Aug 25, 2019 •

edited

Loading

lafriks commented Aug 26, 2019

6543 commented Aug 26, 2019

lafriks commented Aug 26, 2019 •

edited

Loading

6543 commented Aug 26, 2019

codecov-io commented Aug 26, 2019 •

edited

Loading

6543 commented Aug 29, 2019

gary-kim left a comment

6543 commented Sep 1, 2019

gary-kim commented Sep 1, 2019 •

edited

Loading

6543 commented Sep 3, 2019

lunny commented Sep 3, 2019

6543 commented Sep 3, 2019 •

edited

Loading

6543 commented Sep 5, 2019 •

edited

Loading

6543 commented Oct 5, 2019

6543 commented Oct 5, 2019

6543 commented Oct 5, 2019 •

edited

Loading

6543 left a comment •

edited

Loading

lunny Oct 6, 2019

6543 Oct 6, 2019

6543 commented Oct 6, 2019 •

edited

Loading

[Branch View] manual merge tag #7979

[Branch View] manual merge tag #7979

Conversation

6543 commented Aug 25, 2019 • edited Loading

UI:

lafriks commented Aug 26, 2019

6543 commented Aug 26, 2019

lafriks commented Aug 26, 2019 • edited Loading

6543 commented Aug 26, 2019

codecov-io commented Aug 26, 2019 • edited Loading

Codecov Report

6543 commented Aug 29, 2019

gary-kim left a comment

Choose a reason for hiding this comment

6543 commented Sep 1, 2019

gary-kim commented Sep 1, 2019 • edited Loading

6543 commented Sep 3, 2019

lunny commented Sep 3, 2019

6543 commented Sep 3, 2019 • edited Loading

6543 commented Sep 5, 2019 • edited Loading

6543 commented Oct 5, 2019

6543 commented Oct 5, 2019

Actual State:

UI:

6543 commented Oct 5, 2019 • edited Loading

6543 left a comment • edited Loading

Choose a reason for hiding this comment

lunny Oct 6, 2019

Choose a reason for hiding this comment

6543 Oct 6, 2019

Choose a reason for hiding this comment

6543 commented Oct 6, 2019 • edited Loading

6543 commented Aug 25, 2019 •

edited

Loading

lafriks commented Aug 26, 2019 •

edited

Loading

codecov-io commented Aug 26, 2019 •

edited

Loading

gary-kim commented Sep 1, 2019 •

edited

Loading

6543 commented Sep 3, 2019 •

edited

Loading

6543 commented Sep 5, 2019 •

edited

Loading

6543 commented Oct 5, 2019 •

edited

Loading

6543 left a comment •

edited

Loading

6543 commented Oct 6, 2019 •

edited

Loading