Gogs: Pull Requests support in the same repository (between the branches)

[bastiao]

[bhchew]

+1

[ewoutp]

+1

[moritzuehling]

+1

[marcinwyszynski]

+1, it's actually a blocker for me

[Tim91084]

+1

[carlosfvp]

+1

[aganoza]

@Unknwon please could you point me to the relevant files to help make this feature happen?, regardless thanks for your time making this project.

[unknwon]

@aganoza it's not as simple as edit a file to make this work.

[JohnMaguire]

:+1:

And an aside: @Unknwon I am very thankful for Gogs. I've been running it a while now and it's been solid. I am glad that there is a real competitor to GitLab, and I'm glad it's in the Go ecosystem, You've been a champ pushing out this much code for the past year and a half. Seriously, thank you.

[unknwon]

@JohnMaguire :trollface:

[chrispappas]

+1 for this - adding the ability to do "Merge Requests" ala Gitlab would be a great addition

[martindafonte]

It would be nice indeed, it would make it a lot easier to our team to implement code revision with this feature

[Fedott]

+1

[drsect0r]

+1

[dumpstate]

+1

[daniviga]

+1

[dabaer]

+1 Yas, needed very much.

[mkaito]

:+1:

[osklyar]

:+1:

[mkaito]

This is the last thing I'm actually waiting on. Then I can begin pestering @Unknwon about trello integration :stuck_out_tongue:

[bhchew]

Think in conjunction, will also need to implement more fine grain access control within the repo. If not anyone can merge the changes, bypassing the PR... Great work @Unknwon !

[unknwon]

:trollface:

[skorokithakis]

+1

[nestabur]

+1

[windsource]

+1

[BurakDev]

+1, I need it too :sunglasses:

[gnanakeethan]

+1

[doliver3]

Please add this feature for pull requests between branches in the same repo. This is a critical essential feature.

[DarthNihilus1]

+1000000

[pohy]

+1, this is much needed

[kisst]

+1

[bergwerf]

+1

[codingfishman]

+1

[randy-girard]

+1

[kotchuprik]

I need it! :fire_engine:

[ivanlemeshev]

+1

[markramakers]

+1

[pentix]

:+1: +1

[migibert]

+1

[beowulf13th]

+1 :)

[lucacervasio]

+1

[squishykid]

+1

[qunabu]

+1

[lostsnow]

+1

[maliskovik]

+1

[dmavrin]

+1

[galaktor]

This feature is very important if I want to get more people to use our gogs server.

[Techwolf12]

+1

[misugijunz]

Hi. As I post in your blog article's comment section. The scenario will be like this https://confluence.atlassian.com/bitbucketserver/using-pull-requests-in-bitbucket-server-776639997.html

a. There will be a master branch that will updated periodically.
b. There will be several dev branches. Let say we have R1 for release one dev branch.
c. Developer should create a new branch when working on a feature/bugfix against dev branch. For example, a new feature for R1 will be developed under 'feature/name_r1_featurename' (change feature to bug fix if it is bug fixing). He/she is committing and pushing the works to the organization repository.
d. Dev login the stash and create new pull request from his branch to existing dev branch and assign few peer devs to review it (ex: feature/name_r1_featurename to R1)
e. Assigned peer devs can review the changes made and acknowledge the pull request if there is no issue.
f. Team lead can merge it (since usual dev don't have capability to merge it).

[tobigue]

+1

[guillemcanal]

+1

[arnaudruffin]

+1

[antechrestos]

+1

[sksullivan]

+1

[mccordnate]

+1

[felipesere]

+1

[thomas15v]

:+1:

[rsids]

:+1:

[earlye]

+1

[getson]

+1

[stubobis1]

+1

[stevoh6]

@misugijunz really good explanation. This function is important to many developers :-)

+1

[vladimir-polyakov]

+1

[okv]

+1

[hydandata]

+1 This is an amazing feature, relying it a lot on GitHub.

[stubobis1]

Is there any update on this? Is it possible to do easily?

[unknwon]

@stubobis1 not spossible yet.

[stubobis1]

@Unknwon what sort of changes need to take place?

[unknwon]

@stubobis1 thanks for asking but it's a false question, because you're going to have no ideas about what I'm talking in technical details. :sweat:

[earlye]

Don't underestimate us. Some of us are willing to help, but without a little direction it's really difficult for us to even get started.

[nightcoding]

+1 currently a blocker for us

[unknwon]

Whoever watches on this thread, please help test develop branch or https://try.gogs.io

[guillemcanal]

@Unknwon I'll for sure ;)

[Techwolf12]

@Unknwon I will as well!

[bastiao]

This is really great news! It seems to work! I will test with more detail for sure.

[Techwolf12]

@Unknwon

• When on master and pressing new pull request in the pull request list or pressing the pull request button on the master branch page, url (/techwolf12/test/compare/master...master) gives a 404, it isn't supposed to make a master to master pull request anyway
• When on dev branch, pressing the pull request icon goes to (/techwolf12/test/compare/master...dev) and gives a 404

[unknwon]

@Techwolf12 any usable links on https://try.gogs.io?

[Techwolf12]

@Unknwon The rest on try.gogs.io is usable for me. Can you create a pull request between branches on my repo? https://try.gogs.io/techwolf12/test I've given you collaborator rights

[unknwon]

@Techwolf12 Yes... https://try.gogs.io/techwolf12/test/compare/master...dev

[unknwon]

@Techwolf12 I might know the problem, let me check.

[Techwolf12]

@Unknwon Sure. Please let me know once you want me to test again
For the record:

[Techwolf12]

@Unknwon @guillemcanal
After being added to https://try.gogs.io/gogogo/testing-repo (Thanks, Guillem!) I can make a pull request. However I do get a 500 upon creation. I suspect it has something to do with the slash in the branch name: https://try.gogs.io/gogogo/testing-repo/compare/master...feat/add-content-to-readme

[unknwon]

@Techwolf12 Updated demo site, you should be able to create PR on your own repository now.

[unknwon]

Also, https://try.gogs.io/gogogo/testing-repo/pulls/1 @Techwolf12

[Techwolf12]

@Unknwon Success! https://try.gogs.io/techwolf12/test/pulls/1#issuecomment-620
However the 500 error is for every branch I try to merge on https://try.gogs.io/gogogo/testing-repo. Can you check in the server logs for me?

[unknwon]

@Techwolf12 error:

2016/03/04 16:17:25 [...routers/repo/pull.go:680 CompareAndPullRequestPost()] [E] NewPullRequest: newIssue: Find all labels: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '))' at line 1

[Techwolf12]

@Unknwon I am going to try to look into that. An other issue: https://try.gogs.io/techwolf12/test/pulls/2
Merging it manually from command line because of a conflict, it doesn't resolve the pull request and the changed files/commits are on N/A (and non-clickable)

[guillemcanal]

It look good so far, great job! Merge conflict are properly detected.

[unknwon]

@Techwolf12 I think this is expected, you can only view until you solve the conflict and push again.

[Techwolf12]

@Unknwon I agree with the part you can only view and needing to merge from command line. However once you do this merge it doesn't show the commits left and you need to manually close it on the PR page. It does however work partially as expected and is not a very blocking issue now.

[guillemcanal]

@Unknwon @Techwolf12 I may be mistaken, but I solved a merge conflict on that branch and still, I'm not allowed to merge: https://try.gogs.io/gogogo/testing-repo/pulls/3

[unknwon]

@guillemcanal close and reopen solve the problem, I'll dig into why.

[guillemcanal]

@Unknwon Thanks ;)

[unknwon]

@guillemcanal did you use push --force to solve the conflict?

[guillemcanal]

@Unknwon yes indeed

[unknwon]

@guillemcanal solved.

[guillemcanal]

@Unknwon just so you know: I had to logout/login to see the merge pull request button. Maybe it's a side effect caused by the client been updated in the process ;)

[unknwon]

I had to logout/login to see the merge pull request button

What is this exactly?

[guillemcanal]

@Unknwon Well, on the pull request page, before I logged out, the "merge pull request" (I don't really know if it's the exact phrase for that button) where not present. So, I decided to log out and log back in. Then on the "merge pull request" came back.

By logging out, I meant "Sign out" ;)

[unknwon]

@Unknwon Well, on the pull request page, before I logged out, the "merge pull request" (I don't really know if it's the exact phrase for that button) where not present. So, I decided to log out and log back in. Then on the "merge pull request" came back.

I think refresh the page will do the same job, because it was checking conflict at the moment you send the new pull request. But checking is fast enough to show you result in the next refresh.

[guillemcanal]

@Unknwon So I tested another merge conflict pull request, once resolved, It went as expected. Nice work you did there :+1:

[guillemcanal]

@Unknwon One last thing: It seems that collaborators have the right to push commits on the master branch, have you any plans to release a feature to prevent such a thing ? Anyway, nice work so far, Go is a really nice language. I'll give it a try ASAP.

[unknwon]

@guillemcanal you can follow https://github.com/gogits/gogs/issues/776

[guillemcanal]

@Unknwon thanks, subscribed :)

[joshfng]

@Unknwon great work I've been testing locally. One thing I noticed is the activity feed shows "Issue closed" when closing a PR, but it says "Pull Request opened" when opening one.

[unknwon]

@joshfng good catch!

[unknwon]

@joshfng old ones can't fix, but new ones will look like:

Now on develop branch and demo site.

[joshfng]

:+1:

[moltam]

On Github you can choose repos at compare. For example a compare on a forked repo by default looks like this:

You can switch to local compare if you click on 'compare across forks' (Same thing happens if you choose your forked repo as base.):

On the original repo (which was forked) the compare defaults to local compare (But you can also switch to compare between your forks.):

@Unknwon Do you think this could be implemented in Gogs? Not necessary in this issue, but maybe later.

Now in Gogs on a fork you can compare only to the origin repo. I get a 404 error on a fork when I manually change the URL to compare between local branches.

Also, the local compare is working great, thank you for your work!

[unknwon]

@moltam it could, but not in near future. :sweat: and out of scope of this thread, you can open another issue to keep the record.

[unknwon]

Close as implemented.

[Techwolf12]

Whooo! Nice work @Unknwon :)

[drsect0r]

Whooo! Awesome @Unknwon :+1:

[sardaukar]

Great job!! Kudos @Unknwon

[daniviga]

Thank you @Unknwon !!!

[BurakDev]

Finally, thanks @Unknwon :+1:

[lucacervasio]

thanks

[andrewgreenh]

I'm using gogs on Version: 0.9.13.0319
Whenever I press the green PR button, i get redirected to /compare/master...master and it shows a 404 error :(
Would really like to use this feature!

[drsect0r]

@andreasgruenh Try updating to the latest Gogs version (v0.9.71 at time of writing)

[andrewgreenh]

Is it save to upgrade without losing settings or repos?

[drsect0r]

@andreasgruenh It should be safe. You can always make a backup of you bare repositories and database. (you should git bundle when backing up repositories)

[bkcsoft]

you can use ./gogs dump as well to make a backup of everything

[andrewgreenh]

I just updated to Gogs Version: 0.9.71.0809 and I still get the 404 error when clicking on one of the pull-request buttons. Any chance my reverse proxy causes this?

[dpheenatigala]

I have had problems with trying to create pull requests with gogs version 0.9.97.0901 where branches have hyphens in them. The below log is created when i try to compare "resource-allocation-tasks" and "develop" branch.

2016/10/28 11:32:22 [...uters/repo/commit.go:230 CompareDiff()] [E] GetCommit: exit status 128 - fatal: ambiguous argument 'resource': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

P.S. The compare url pointed to by the "octicon-git-compare" doesn't change when the branch that is viewed is changed. This means the link always goes to "[user]/[repo]/compare/develop...develop" despite which branch i am browsing currently.

[M2shad0w]

Whooo! Awesome @Unknwon 👍