Migration To Git - Revision history

Tuukka Lehtonen: Replaced www.simantics.org:8088 with gerrit.simantics.org.

2018-05-08T06:56:56Z

Replaced www.simantics.org:8088 with gerrit.simantics.org.

Tuukka Lehtonen: /* Eclipse */

2017-08-15T10:29:49Z

Eclipse

← Older revision		Revision as of 10:29, 15 August 2017
Line 57:		Line 57:
	=== Eclipse ===		=== Eclipse ===

	The following instructions are written for Eclipse Neon. There are some differences if you are using Mars or Oxygen.		The following instructions are written for Eclipse Neon. There are some differences if you are using Mars (4.5) or Oxygen (4.7).

	# Go to preferences (General / Network Connections / SSH2) and ensure that '''SSH2 home''' points to the directory where you saved the private key.		# Go to preferences (General / Network Connections / SSH2) and ensure that '''SSH2 home''' points to the directory where you saved the private key.

Tuukka Lehtonen: /* Eclipse */

2017-08-15T10:29:38Z

Eclipse

← Older revision		Revision as of 10:29, 15 August 2017
Line 57:		Line 57:
	=== Eclipse ===		=== Eclipse ===

	The following instructions are written for Eclipse Neon. There ~~might be~~ some differences if you are using Mars.		The following instructions are written for Eclipse Neon. There are some differences if you are using Mars or Oxygen.

	# Go to preferences (General / Network Connections / SSH2) and ensure that '''SSH2 home''' points to the directory where you saved the private key.		# Go to preferences (General / Network Connections / SSH2) and ensure that '''SSH2 home''' points to the directory where you saved the private key.

Tuukka Lehtonen: /* SVN to Git Transition TODO */

2017-08-15T10:13:22Z

SVN to Git Transition TODO

← Older revision		Revision as of 10:13, 15 August 2017
Line 282:		Line 282:
	== SVN to Git Transition TODO ==		== SVN to Git Transition TODO ==

	* Test and migrate all products trunk versions on top of the simantics-platform git master branch.		* <strike>Test and migrate all products trunk versions on top of the simantics-platform git master branch.</strike>
	* <strike>Fix the SDK org.simantics.root build to produce source bundles. It should work already but it just doesn't at the moment. Perhaps something needs to defined in org.simantics.sdk.repository/pom.xml.</strike>		* <strike>Fix the SDK org.simantics.root build to produce source bundles. It should work already but it just doesn't at the moment. Perhaps something needs to defined in org.simantics.sdk.repository/pom.xml.</strike>
	* <strike>Set a date for when SVN trunks will be changed to read-only (16.12.2016)</strike>		* <strike>Set a date for when SVN trunks will be changed to read-only (16.12.2016)</strike>

Marko Luukkainen: /* Gerrit */

2017-04-11T09:42:04Z

Gerrit

← Older revision		Revision as of 09:42, 11 April 2017
Line 23:		Line 23:
	#* Linux		#* Linux
	#** Generate public and private keys using <code>ssh-keygen -t rsa</code>		#** Generate public and private keys using <code>ssh-keygen -t rsa</code>
	# Go to ~~http~~://www.simantics.org:8088/r/ and log in with your Gerrit username/password		# Go to https://www.simantics.org:8088/r/ and log in with your Gerrit username/password
	# Select your name in the top-right corner and press ''Settings''		# Select your name in the top-right corner and press ''Settings''
	# Go to section '''SSH Public Keys'''		# Go to section '''SSH Public Keys'''

Tuukka Lehtonen: /* Simantics Member Read-only Git Access */

2017-02-26T09:58:43Z

Simantics Member Read-only Git Access

← Older revision		Revision as of 09:58, 26 February 2017
Line 129:		Line 129:

	# Register to member wiki at https://www.simantics.org/members/index.php		# Register to member wiki at https://www.simantics.org/members/index.php
	# Log into [~~http~~://www.simantics.org:8088/r/# Gerrit] using the credentials found at https://www.simantics.org/members/index.php/Code_Repository_Access		# Log into [https://www.simantics.org:8088/r/# Gerrit] using the credentials found at https://www.simantics.org/members/index.php/Code_Repository_Access
	# Clone ~~http~~://member@www.simantics.org:8088/r/p/simantics/platform.git using the HTTP password found at ~~http~~://www.simantics.org:8088/r/#/settings/http-password		# Clone https://member@www.simantics.org:8088/r/p/simantics/platform.git using the HTTP password found at https://www.simantics.org:8088/r/#/settings/http-password

	The [[#Eclipse\|instructions for using Eclipse]] with this git repository apply also for the generic member account. Just remember to replace the cloned SSH repository address with the HTTP address shown above.		The [[#Eclipse\|instructions for using Eclipse]] with this git repository apply also for the generic member account. Just remember to replace the cloned SSH repository address with the HTTP address shown above.

Tuukka Lehtonen: /* Platform Git Branching Model */

2017-01-09T11:33:15Z

Platform Git Branching Model

← Older revision		Revision as of 11:33, 9 January 2017
Line 151:		Line 151:

	Branch naming conventions:		Branch naming conventions:
	* features: <code>feature/<PROJECT-NAME>-<issuenumber></code>.		* features: <code>feature/<PROJECT NAME>-<issuenumber></code>.
	** Use these for developing a single feature. To keep the version history of feature branches cleaner, merge commit pushing is limited to project owners only. This means that feature branches should be used for implementing a particular thing and then merged back to master or some other branch. They should not be used as locations for eternal development and never ending try-outs.		** Use these for developing a single feature. To keep the version history of feature branches cleaner, merge commit pushing is limited to project owners only. This means that feature branches should be used for implementing a particular thing and then merged back to master or some other branch. They should not be used as locations for eternal development and never ending try-outs.
	* releases: <code>release/x.y.z</code>, where x, y and z are major, minor and service version numbers respectively.		* releases: <code>release/x.y.z</code>, where x, y and z are major, minor and service version numbers respectively.
	** Only for release stabilization branches.		** Only for release stabilization branches.
	* private work branches: <code>private/*</code>.		* private work branches: <code>private/<PROJECT or USER NAME>-<possible descriptive suffix></code>.
	** Should be used for personal work, trials and possibly even user or project specific custom branches that need to be kept. Gerrit is not configured enforce any rules on how these branches are used.		** Should be used for personal work, trials and possibly even user or project specific custom branches that need to be kept. Gerrit is not configured enforce any rules on how these branches are used.
	* hotfixes: <code>hotfix/x.y.z.<hotfix number></code>.		* hotfixes: <code>hotfix/x.y.z.<hotfix number></code>.

Tuukka Lehtonen: /* Eclipse */

2016-12-29T14:49:01Z

Eclipse

← Older revision		Revision as of 14:49, 29 December 2016
Line 61:		Line 61:
	# Go to preferences (General / Network Connections / SSH2) and ensure that '''SSH2 home''' points to the directory where you saved the private key.		# Go to preferences (General / Network Connections / SSH2) and ensure that '''SSH2 home''' points to the directory where you saved the private key.
	# Go to preferences (Team / Git / Configuration) and ensure that the tab '''User Settings''' has the following two setting: <code>user.name</code> and <code>user.email</code>. The specified name and email must match the values you've put in Gerrit to be able to push changes.<br/>[[image:git-global-config.png\|400px]]		# Go to preferences (Team / Git / Configuration) and ensure that the tab '''User Settings''' has the following two setting: <code>user.name</code> and <code>user.email</code>. The specified name and email must match the values you've put in Gerrit to be able to push changes.<br/>[[image:git-global-config.png\|400px]]
	#* Also, git has a setting called <code>core.autocrlf</code> which is used for controlling the way git enforces line feeds to be encoded in a certain way in commits. Read [https://git-scm.com/book/tr/v2/Customizing-Git-Git-Configuration#idp31554304 the documentation] to learn more. We recommend to set it <code>true</code> in Windows in order to avoid committing CRLFs to ~~repostory~~.		#* Also, git has a setting called <code>core.autocrlf</code> which is used for controlling the way git enforces line feeds to be encoded in a certain way in commits. Read [https://git-scm.com/book/tr/v2/Customizing-Git-Git-Configuration#idp31554304 the documentation] and [http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/#the-old-system also this] to learn more. We recommend to set it to <code>true</code> in Windows in order to avoid committing CRLFs to repository.
	#* If you have a git command line client installed you can use the command <code>git config --list --show-origin</code> to see your current global settings and find out exactly where your settings are coming from.		#* If you have a git command line client installed you can use the command <code>git config --list --show-origin</code> to see your current global settings and find out exactly where your settings are coming from.
	# Open ''Git'' perspective		# Open ''Git'' perspective

Hannu Niemisto: /* Eclipse */

2016-12-29T14:38:43Z

Eclipse

← Older revision		Revision as of 14:38, 29 December 2016
Line 61:		Line 61:
	# Go to preferences (General / Network Connections / SSH2) and ensure that '''SSH2 home''' points to the directory where you saved the private key.		# Go to preferences (General / Network Connections / SSH2) and ensure that '''SSH2 home''' points to the directory where you saved the private key.
	# Go to preferences (Team / Git / Configuration) and ensure that the tab '''User Settings''' has the following two setting: <code>user.name</code> and <code>user.email</code>. The specified name and email must match the values you've put in Gerrit to be able to push changes.<br/>[[image:git-global-config.png\|400px]]		# Go to preferences (Team / Git / Configuration) and ensure that the tab '''User Settings''' has the following two setting: <code>user.name</code> and <code>user.email</code>. The specified name and email must match the values you've put in Gerrit to be able to push changes.<br/>[[image:git-global-config.png\|400px]]
	#* Also, git has a setting called <code>core.autocrlf</code> which is used for controlling the way git enforces line feeds to be encoded in a certain way in commits. Read [https://git-scm.com/book/tr/v2/Customizing-Git-Git-Configuration#idp31554304 the documentation] to learn more. We recommend to set it <code>true</~~true~~> in Windows in order to avoid committing CRLFs to repostory.		#* Also, git has a setting called <code>core.autocrlf</code> which is used for controlling the way git enforces line feeds to be encoded in a certain way in commits. Read [https://git-scm.com/book/tr/v2/Customizing-Git-Git-Configuration#idp31554304 the documentation] to learn more. We recommend to set it <code>true</code> in Windows in order to avoid committing CRLFs to repostory.
	#* If you have a git command line client installed you can use the command <code>git config --list --show-origin</code> to see your current global settings and find out exactly where your settings are coming from.		#* If you have a git command line client installed you can use the command <code>git config --list --show-origin</code> to see your current global settings and find out exactly where your settings are coming from.
	# Open ''Git'' perspective		# Open ''Git'' perspective

Hannu Niemisto: /* Eclipse */

2016-12-29T14:38:06Z

Eclipse

← Older revision		Revision as of 14:38, 29 December 2016
Line 61:		Line 61:
	# Go to preferences (General / Network Connections / SSH2) and ensure that '''SSH2 home''' points to the directory where you saved the private key.		# Go to preferences (General / Network Connections / SSH2) and ensure that '''SSH2 home''' points to the directory where you saved the private key.
	# Go to preferences (Team / Git / Configuration) and ensure that the tab '''User Settings''' has the following two setting: <code>user.name</code> and <code>user.email</code>. The specified name and email must match the values you've put in Gerrit to be able to push changes.<br/>[[image:git-global-config.png\|400px]]		# Go to preferences (Team / Git / Configuration) and ensure that the tab '''User Settings''' has the following two setting: <code>user.name</code> and <code>user.email</code>. The specified name and email must match the values you've put in Gerrit to be able to push changes.<br/>[[image:git-global-config.png\|400px]]
	#* Also, git has a setting called <code>core.autocrlf</code> which is used for controlling the way git enforces line feeds to be encoded in a certain way in commits. Read [https://git-scm.com/book/tr/v2/Customizing-Git-Git-Configuration#idp31554304 the documentation] to learn more. ~~If you want to be sure that git never converts your linefeeds from CRLF to LF, you'll want~~ to set ~~this setting to~~ <code>~~false~~</~~code~~>~~. To~~ avoid ~~pollution of the git history with unintentional CRLF -> LF changes, we recommend setting this~~ to ~~<code>false</code>~~.		#* Also, git has a setting called <code>core.autocrlf</code> which is used for controlling the way git enforces line feeds to be encoded in a certain way in commits. Read [https://git-scm.com/book/tr/v2/Customizing-Git-Git-Configuration#idp31554304 the documentation] to learn more. We recommend to set it <code>true</true> in Windows in order to avoid committing CRLFs to repostory.
	#* If you have a git command line client installed you can use the command <code>git config --list --show-origin</code> to see your current global settings and find out exactly where your settings are coming from.		#* If you have a git command line client installed you can use the command <code>git config --list --show-origin</code> to see your current global settings and find out exactly where your settings are coming from.
	# Open ''Git'' perspective		# Open ''Git'' perspective

← Older revision		Revision as of 06:56, 8 May 2018
Line 23:		Line 23:
	#* Linux		#* Linux
	#** Generate public and private keys using <code>ssh-keygen -t rsa</code>		#** Generate public and private keys using <code>ssh-keygen -t rsa</code>
	# Go to https://~~www~~.simantics.org~~:8088~~/r/ and log in with your Gerrit username/password		# Go to https://gerrit.simantics.org/r/ and log in with your Gerrit username/password
	# Select your name in the top-right corner and press ''Settings''		# Select your name in the top-right corner and press ''Settings''
	# Go to section '''SSH Public Keys'''		# Go to section '''SSH Public Keys'''
Line 38:		Line 38:
	click on the following link while signed in as .....:		click on the following link while signed in as .....:

	~~http~~://~~www~~.simantics.org~~:8088~~/r/#/../...............................................................................==		https://gerrit.simantics.org/r/#/../...............................................................................==

	If you have received this mail in error, you do not need to take any		If you have received this mail in error, you do not need to take any
Line 95:		Line 95:
	# Press '''Commit and Push...'''		# Press '''Commit and Push...'''
	# This opens a dialog that asks the Gerrit Branch and a Topic. Topic can be added optionally to tie multiple changes together.		# This opens a dialog that asks the Gerrit Branch and a Topic. Topic can be added optionally to tie multiple changes together.
	#* Example of a topic: ~~http~~://~~www~~.simantics.org~~:8088~~/r/#/q/topic:svn		#* Example of a topic: https://gerrit.simantics.org/r/#/q/topic:svn
	# Go to Gerrit. In the top-left menu select '''My''' and select '''Changes'''.		# Go to Gerrit. In the top-left menu select '''My''' and select '''Changes'''.
	# Your change can be seen now in the section '''Outgoing reviews'''.		# Your change can be seen now in the section '''Outgoing reviews'''.
Line 129:		Line 129:

	# Register to member wiki at https://www.simantics.org/members/index.php		# Register to member wiki at https://www.simantics.org/members/index.php
	# Log into [https://~~www~~.simantics.org~~:8088~~/r/# Gerrit] using the credentials found at https://www.simantics.org/members/index.php/Code_Repository_Access		# Log into [https://gerrit.simantics.org/r/# Gerrit] using the credentials found at https://www.simantics.org/members/index.php/Code_Repository_Access
	# Clone https://member@~~www~~.simantics.org~~:8088~~/r/p/simantics/platform.git using the HTTP password found at https://~~www~~.simantics.org~~:8088~~/r/#/settings/http-password		# Clone https://member@gerrit.simantics.org/r/p/simantics/platform.git using the HTTP password found at https://gerrit.simantics.org/r/#/settings/http-password

	The [[#Eclipse\|instructions for using Eclipse]] with this git repository apply also for the generic member account. Just remember to replace the cloned SSH repository address with the HTTP address shown above.		The [[#Eclipse\|instructions for using Eclipse]] with this git repository apply also for the generic member account. Just remember to replace the cloned SSH repository address with the HTTP address shown above.
Line 138:		Line 138:
	To test reviewed code changes locally, first you must have an Eclipse IDE setup according to the instructions in [[#Instructions for Simantics Developers]] or [[#Simantics Member Read-only Git Access]].		To test reviewed code changes locally, first you must have an Eclipse IDE setup according to the instructions in [[#Instructions for Simantics Developers]] or [[#Simantics Member Read-only Git Access]].

	Now, let's say for example we wish to grab a patch set from a review, such as review #72 (~~http~~://~~www~~.simantics.org~~:8088~~/r/72).		Now, let's say for example we wish to grab a patch set from a review, such as review #72 (https://gerrit.simantics.org/r/72).

	# Open '''Git''' perspective		# Open '''Git''' perspective
Line 186:		Line 186:
	\|'''SVN Location'''\|\|'''Gerrit project'''		\|'''SVN Location'''\|\|'''Gerrit project'''
	\|-		\|-
	\|All over https://www.simantics.org/svn/simantics/\|\|https://~~www~~.simantics.org~~:8088~~/r/#/admin/projects/simantics/platform		\|All over https://www.simantics.org/svn/simantics/\|\|https://gerrit.simantics.org/r/#/admin/projects/simantics/platform
	\|-		\|-
	\|https://www.simantics.org/svn/simantics/3d\|\|https://~~www~~.simantics.org~~:8088~~/r/#/admin/projects/simantics/3d		\|https://www.simantics.org/svn/simantics/3d\|\|https://gerrit.simantics.org/r/#/admin/projects/simantics/3d
	\|-		\|-
	\|https://www.simantics.org/svn/simantics/fmi\|\|https://~~www~~.simantics.org~~:8088~~/r/#/admin/projects/simantics/fmil		\|https://www.simantics.org/svn/simantics/fmi\|\|https://gerrit.simantics.org/r/#/admin/projects/simantics/fmil
	\|-		\|-
	\|https://www.simantics.org/svn/simantics/r\|\|https://~~www~~.simantics.org~~:8088~~/r/#/admin/projects/simantics/r		\|https://www.simantics.org/svn/simantics/r\|\|https://gerrit.simantics.org/r/#/admin/projects/simantics/r
	\|-		\|-
	\|Everything except OpenModelica bundles from<br/>https://www.simantics.org/svn/simantics/sysdyn\|\|https://~~www~~.simantics.org~~:8088~~/r/#/admin/projects/simantics/sysdyn		\|Everything except OpenModelica bundles from<br/>https://www.simantics.org/svn/simantics/sysdyn\|\|https://gerrit.simantics.org/r/#/admin/projects/simantics/sysdyn
	\|-		\|-
	\|Parts of https://www.simantics.org/svn/simantics/third-party/trunk\|\|https://~~www~~.simantics.org~~:8088~~/r/#/admin/projects/simantics/third-party		\|Parts of https://www.simantics.org/svn/simantics/third-party/trunk\|\|https://gerrit.simantics.org/r/#/admin/projects/simantics/third-party
	\|-		\|-
	\|https://www.simantics.org/svn/members/fmi\|\|https://~~www~~.simantics.org~~:8088~~/r/#/admin/projects/members/fmi		\|https://www.simantics.org/svn/members/fmi\|\|https://gerrit.simantics.org/r/#/admin/projects/members/fmi
	\|}		\|}

Line 228:		Line 228:
	SVN project structure location to be converted: https://www.simantics.org/svn/simantics/3d/		SVN project structure location to be converted: https://www.simantics.org/svn/simantics/3d/

	Firstly, create a new project in Gerrit ([https://~~www~~.simantics.org~~:8088~~/r/#/admin/create-project/]). Create the project without an empty initial commit because the initial commits will come from the SVN repository anyway. In this example the project name <code>simantics/3d</code> is used.		Firstly, create a new project in Gerrit ([https://gerrit.simantics.org/r/#/admin/create-project/]). Create the project without an empty initial commit because the initial commits will come from the SVN repository anyway. In this example the project name <code>simantics/3d</code> is used.

	Next clone the newly created git repository:		Next clone the newly created git repository: