It is currently 17 Nov 2018, 15:35
   
Text Size

Git Migration

Post MTG Forge Related Programming Questions Here

Moderators: timmermac, friarsol, Blacksmith, KrazyTheFox, Agetian, CCGHQ Admins

Git Migration

Postby KrazyTheFox » 19 Jul 2017, 21:47

This weekend we'll be making an attempt to migrate the code base to Git hosted on GitLab (https://git.cardforge.org) as part of an effort to increase code stability, improve automatic releases/snapshots/etc, and to make it easier to contribute to Forge. This change will make it so that anyone will be able to contribute to the project, not just approved committers.

At the moment, the plan of action is to do the next release of Forge on Friday, after which everyone's committing rights will be removed from Subversion so that we do not lose any commits. During the day on Saturday, I will be converting the project over to Git and uploading it to the aforementioned site. It is my hope that this will take less than 24 hours, but we all know how perfectly planned things go when it comes time to execute them.

The new process for committing code will be to clone the project to your namespace (easier than it sounds!) in GitLab, make modifications in local branches, then request that they be merged into the master copy. Another dev will have to review your request and approve it.

I highly recommend reading the Git Book (https://git-scm.com/book/en/v2) if you've never used Git before or need to brush up on it.

If you have any questions or concerns, let me know and I'll do my best to address them.
Last edited by KrazyTheFox on 23 Jul 2017, 21:36, edited 1 time in total.
User avatar
KrazyTheFox
Programmer
 
Posts: 723
Joined: 18 Mar 2014, 23:51
Has thanked: 66 times
Been thanked: 225 times

Re: Git Migration

Postby friarsol » 21 Jul 2017, 15:26

As quickly as I'm able to after the upcoming release i plan on revoking svn access to prevent accidental commits. Please speak up if you have questions
friarsol
Global Moderator
 
Posts: 7306
Joined: 15 May 2010, 04:20
Has thanked: 235 times
Been thanked: 904 times

Re: Git Migration

Postby Seravy » 22 Jul 2017, 09:10

Started reading the above link.

"clients don’t just check out the latest snapshot of the files: they fully mirror the repository. Thus if any server dies, and these systems were collaborating via it, any of the client repositories can be copied back up to the server to restore it. Every clone is really a full backup of all the data."

so I wonder...how much data is that? Forge is a pretty large project.

"The most official build is available for download on the Git website. ... Another easy way to get Git installed is by installing GitHub for Windows. "
Which one do we need for Eclipse?
Seravy
 
Posts: 363
Joined: 26 Oct 2016, 21:23
Has thanked: 5 times
Been thanked: 27 times

Re: Git Migration

Postby friarsol » 22 Jul 2017, 12:48

privileges have been revoked. Please sign up for a git account
friarsol
Global Moderator
 
Posts: 7306
Joined: 15 May 2010, 04:20
Has thanked: 235 times
Been thanked: 904 times

Re: Git Migration

Postby KrazyTheFox » 22 Jul 2017, 15:42

Git repositories are very small in comparison to subversion ones. You're downloading a bunch of deltas, not a full copy at each commit.
User avatar
KrazyTheFox
Programmer
 
Posts: 723
Joined: 18 Mar 2014, 23:51
Has thanked: 66 times
Been thanked: 225 times

Re: Git Migration

Postby Max mtg » 23 Jul 2017, 20:29

I've made a git account.
Hope, it is to be expected to see an empty repository for Forge project.
Single class for single responsibility.
Max mtg
Programmer
 
Posts: 1997
Joined: 02 Jul 2011, 14:26
Has thanked: 173 times
Been thanked: 334 times

Re: Git Migration

Postby KrazyTheFox » 23 Jul 2017, 21:02

Max mtg wrote:I've made a git account.
Hope, it is to be expected to see an empty repository for Forge project.
Yes, I'm in the process of converting it right now. It's a sizable repository with a lot of history and it'll take a while to finish.

Everyone: If you signed up after Saturday morning, you'll need to add an alternative email to your GitLab account (instructions to come soon) to associate your commits in the form of <yourusernamewithoutspaces@cardforge.org>. For example, maxmtg@cardforge.org or krazythefox@cardforge.org. They're not real addresses (yet), but I did need to put something in there to prevent losing history.
User avatar
KrazyTheFox
Programmer
 
Posts: 723
Joined: 18 Mar 2014, 23:51
Has thanked: 66 times
Been thanked: 225 times

Re: Git Migration

Postby silly freak » 24 Jul 2017, 15:03

Is there a way to clone the repository (read-only of course) without an account? If no, the software is still GPL according to the license in the latest release, so at least upon request, you have to offer access to the source code to users. In light of that, I'd recommend a route to source code access that does not require bugging one of the devs ;)
___

where's the "trust me, that will work!" switch for the compiler?
Laterna Magica - blog, forum, project, 2010/09/06 release!
silly freak
DEVELOPER
 
Posts: 598
Joined: 26 Mar 2009, 07:18
Location: Vienna, Austria
Has thanked: 93 times
Been thanked: 25 times

Re: Git Migration

Postby KrazyTheFox » 24 Jul 2017, 15:36

silly freak wrote:Is there a way to clone the repository (read-only of course) without an account? If no, the software is still GPL according to the license in the latest release, so at least upon request, you have to offer access to the source code to users. In light of that, I'd recommend a route to source code access that does not require bugging one of the devs ;)
Once it's converted and uploaded, it will be readily available to everyone, account or no. The idea behind this change is to make it more accessible, not less.
User avatar
KrazyTheFox
Programmer
 
Posts: 723
Joined: 18 Mar 2014, 23:51
Has thanked: 66 times
Been thanked: 225 times

Re: Git Migration

Postby Max mtg » 25 Jul 2017, 02:07

KrazyTheFox wrote:Everyone: If you signed up after Saturday morning, you'll need to add an alternative email to your GitLab account (instructions to come soon) to associate your commits in the form of <yourusernamewithoutspaces@cardforge.org>. For example, maxmtg@cardforge.org or krazythefox@cardforge.org. They're not real addresses (yet), but I did need to put something in there to prevent losing history.
So, what exactly has to be done?
Single class for single responsibility.
Max mtg
Programmer
 
Posts: 1997
Joined: 02 Jul 2011, 14:26
Has thanked: 173 times
Been thanked: 334 times

Re: Git Migration

Postby KrazyTheFox » 25 Jul 2017, 04:35

We've restored committing privileges for SVN for the time being, as the conversion is taking significantly longer than anticipated. I believe I have a way to continue the conversion without loss of data and will also investigate other conversion methods tomorrow that might be faster.

Also, instructions will come when I have a chance to write them. The conversion itself is more important and has taken my free time thus far. Unfortunately, there's a lot of work to do and I don't have much time to do it in.

For the time being, please only commit small changes and fixes--no large features or modifications. The Git master branch should contain the reasonably bug free version we have now so that new features and such can easily be branched off.
User avatar
KrazyTheFox
Programmer
 
Posts: 723
Joined: 18 Mar 2014, 23:51
Has thanked: 66 times
Been thanked: 225 times

Re: Git Migration

Postby silly freak » 25 Jul 2017, 13:57

KrazyTheFox wrote:We've restored committing privileges for SVN for the time being, as the conversion is taking significantly longer than anticipated. I believe I have a way to continue the conversion without loss of data and will also investigate other conversion methods tomorrow that might be faster.
I don't have much SVN or Migration knowledge, but I'm very good with git and have some time this week, is there any way I can help you? Or are the problems solved and it's just a matter of time now?
___

where's the "trust me, that will work!" switch for the compiler?
Laterna Magica - blog, forum, project, 2010/09/06 release!
silly freak
DEVELOPER
 
Posts: 598
Joined: 26 Mar 2009, 07:18
Location: Vienna, Austria
Has thanked: 93 times
Been thanked: 25 times

Re: Git Migration

Postby Goblin Hero » 22 Aug 2017, 13:19

How's the migration going? I'm asking because I'm in the process of moving the site to another server and I need to know if I should install\configure svn on the new server.
P.S. I can archive and send you the whole svn directory to speed up things.
When you´re a goblin, you don´t have to step forward to be a hero -- everyone else just has to step back.
User avatar
Goblin Hero
Site Admin
Site Admin
 
Posts: 1913
Joined: 23 Oct 2005, 09:37
Location: Russia
Has thanked: 136 times
Been thanked: 310 times

Re: Git Migration

Postby Agetian » 22 Aug 2017, 14:13

Goblin Hero wrote:How's the migration going? I'm asking because I'm in the process of moving the site to another server and I need to know if I should install\configure svn on the new server.
P.S. I can archive and send you the whole svn directory to speed up things.
I asked the other developers on Discord to respond about the current situation, so hopefully they'll also join in here shortly, but from what I understand, the process is taking considerably more time than initially expected, and as things stand right now, SVN is definitely in full and active use by the dev team, pending the completion of a migration process which can take an indeterminate amount of time due to various complications. Unless someone says otherwise and my information is not up to date, I'd say that yes, we might still need SVN on the new server for a while.

- Agetian
Agetian
Programmer
 
Posts: 3279
Joined: 14 Mar 2011, 05:58
Has thanked: 629 times
Been thanked: 477 times

Re: Git Migration

Postby friarsol » 23 Aug 2017, 02:10

Yea, the Migration is on hold due to issues while attempting to transition. An archived svn directory might help speed things up so we can finish the migration more quickly, I'll see if Krazy thinks that's good. We'll keep you in the loop, for when we finish if you plan on removing the svn after we're done with it. Thanks again for hosting us :D
friarsol
Global Moderator
 
Posts: 7306
Joined: 15 May 2010, 04:20
Has thanked: 235 times
Been thanked: 904 times

Next

Return to Developer's Corner

Who is online

Users browsing this forum: No registered users and 14 guests


Who is online

In total there are 14 users online :: 0 registered, 0 hidden and 14 guests (based on users active over the past 10 minutes)
Most users ever online was 279 on 11 Jul 2013, 22:03

Users browsing this forum: No registered users and 14 guests

Login Form