Stale branches on freeorion/freeorion

Programmers discuss here anything related to FreeOrion programming. Primarily for the developers to discuss.

Moderators: Committer, Committer

Post Reply
Message
Author
User avatar
adrian_broher
Programmer
Posts: 1154
Joined: Fri Mar 01, 2013 9:52 am
Location: Germany

Stale branches on freeorion/freeorion

#1 Post by adrian_broher » Thu May 07, 2020 6:45 pm

On the freeorion there are several branches, which are more than 6 month old and are not release branches. Those branches clutter my local autocompletion for no good reason.

This includes:
  • InvadeThroughShields
  • Noisiness
  • PreWarpStart
  • TechTurnsReductionNotCost
  • adrianbroher/breathe-docs
  • adrianbroher/ci-checks
  • adrianbroher/remove-meters
  • adrianbroher/remove-utf8cpp
  • adrianbroher/simple-enum
  • adrianbroher/slider-model
  • adrianbroher/untranslate-autodesc
  • fix-785
Also there is
  • Government
  • Government2
which seem to cover essentially the same topic.

I would like to know which one of those can be ditched as the idea was not feasible and which ones of should be rebased and integrated into master.

Also it would be great if the project would enable the automatic deletion of branches on merging a pull request:

Managing the automatic deletion of branches
Resident code gremlin
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz

User avatar
Cjkjvfnby
AI Contributor
Posts: 480
Joined: Tue Jun 24, 2014 9:55 pm

Re: Stale branches on freeorion/freeorion

#2 Post by Cjkjvfnby » Thu May 07, 2020 11:33 pm

adrian_broher wrote:
Thu May 07, 2020 6:45 pm
Those branches clutter my local autocompletion for no good reason
And I see your name in these branches. Are you talking with yourself?

I worked in the repo with a lot of stale branches. It was not a trouble for me, it just looked ugly. But we had a user prefix (2-3 chars) in the name of each branch and rarely had commits from different persons in one branch.

Everyone can use own fork and have no branches in the main repo.
A limited number of developers can create branches in freeorion repo, and only two of them create development branches. All branches without PRs can be moved to user forks. Other branches can be discussed in PRs.

Also it would be great if the project would enable the automatic deletion of branches on merging a pull request:
+1
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0

User avatar
adrian_broher
Programmer
Posts: 1154
Joined: Fri Mar 01, 2013 9:52 am
Location: Germany

Re: Stale branches on freeorion/freeorion

#3 Post by adrian_broher » Thu May 07, 2020 11:42 pm

> And I see your name in these branches. Are you talking with yourself?

If you have nothing of value to contribute then shut the fuck up.
Resident code gremlin
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz

User avatar
Vezzra
Release Manager, Design
Posts: 5295
Joined: Wed Nov 16, 2011 12:56 pm
Location: Sol III

Re: Stale branches on freeorion/freeorion

#4 Post by Vezzra » Fri May 08, 2020 10:54 am

I'd also propose that dev branches should be kept in the personal forks of the respective dev (which most do anyway), instead of the main repo. That would reduce the clutter substantially. There might be special cases where it's helpful to have a dev branch in the main repo, but I'd expect those to be rare.

As for the existing stale branches: can't say much about them (except the fix-785 one, that one I've deleted today). AFAIK all these are stuff Geoff works on, so he has to comment on that.

As far as these adrianbroher/* branches are concerned, I think these ended up accidentally in the main repo. My guess would be that someone at some point pulled your, Marcel, dev branches (for whatever reason) and then somehow pushed them on the main repo without intending to and probably even being aware of doing so. Assuming you don't need those branches we can probably just delete them.

Geoff?

User avatar
adrian_broher
Programmer
Posts: 1154
Joined: Fri Mar 01, 2013 9:52 am
Location: Germany

Re: Stale branches on freeorion/freeorion

#5 Post by adrian_broher » Fri May 08, 2020 11:20 am

Vezzra wrote:
Fri May 08, 2020 10:54 am
As far as these adrianbroher/* branches are concerned, I think these ended up accidentally in the main repo.
Those are backups made by me from when I left the project. But I already have pulled and rebased those that are still relevant. However I cannot delete them due to lacking permissions.
Resident code gremlin
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz

User avatar
Vezzra
Release Manager, Design
Posts: 5295
Joined: Wed Nov 16, 2011 12:56 pm
Location: Sol III

Re: Stale branches on freeorion/freeorion

#6 Post by Vezzra » Fri May 08, 2020 11:28 am

adrian_broher wrote:
Fri May 08, 2020 11:20 am
Those are backups made by me from when I left the project. But I already have pulled and rebased those that are still relevant. However I cannot delete them due to lacking permissions.
Ah, ok, I see. Done. I've just deleted those branches.

Ophiuchus
Programmer
Posts: 1533
Joined: Tue Sep 30, 2014 10:01 am
Location: Wall IV

Re: Stale branches on freeorion/freeorion

#7 Post by Ophiuchus » Fri May 08, 2020 4:46 pm

adrian_broher wrote:
Thu May 07, 2020 11:42 pm
> And I see your name in these branches. Are you talking with yourself?

If you have nothing of value to contribute then shut the fuck up.
I think he did.
Any code or patches in anything posted here is released under the CC and GPL licences in use for the FO project.

Furthermore, I propse... we should default to four combat rounds instead of three ...for the good of playerkind.

User avatar
Cjkjvfnby
AI Contributor
Posts: 480
Joined: Tue Jun 24, 2014 9:55 pm

Re: Stale branches on freeorion/freeorion

#8 Post by Cjkjvfnby » Sun May 10, 2020 7:12 pm

Ophiuchus wrote:
Fri May 08, 2020 4:46 pm
adrian_broher wrote:
Thu May 07, 2020 11:42 pm
> And I see your name in these branches. Are you talking with yourself?

If you have nothing of value to contribute then shut the fuck up.
I think he did.
You don't contribute value too :)

Looks like the trouble with autocomplete is solved, and I can unsubscribe this thread.
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0

User avatar
adrian_broher
Programmer
Posts: 1154
Joined: Fri Mar 01, 2013 9:52 am
Location: Germany

Re: Stale branches on freeorion/freeorion

#9 Post by adrian_broher » Sun May 24, 2020 8:26 am

@Geoff so what is the state of the branches mentioned in OP?
Resident code gremlin
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz

User avatar
Geoff the Medio
Programming, Design, Admin
Posts: 12676
Joined: Wed Oct 08, 2003 1:33 am
Location: Munich

Re: Stale branches on freeorion/freeorion

#10 Post by Geoff the Medio » Sun May 24, 2020 9:15 am

Vezzra reportedly deleted the old branches that were from you.

I think I deleted one or two other branches that were unnecessary due to the related pull request being merged.

The two Government branches I use keeping things rebased for all the major refactorings involving moving big chunks of code into different files in the last few months. They'll go away once the Government stuff is merged, hopefully soon after the next release (or perhaps when the release branch is created).

Noisiness is delayed / put off for other stuff, but might come back in the medium term as a way to improve stealth mechanics.

PreWarpStart should be looked at again after the next release and the Government stuff initially goes in.

TechTurnsReductionNotCost can probably be deleted.

InvadeThroughShields might be interesting to make a species trait or otherwise reworked, but probably implemented differently.

Post Reply