Difference between revisions of "SourceCode"

From RackTables Wiki
Jump to navigation Jump to search
(→‎SVN repository layout (FIXME): update for git specifics)
Line 1: Line 1:
== SVN repository layout (FIXME)==
+
== the source code repository==
RackTables repository currently employs a layout, which is quite standard for SVN.
+
RackTables project uses git as version control system for the source code. The git repository that is used to make "tar.gz" releases is currently hosted on [https://github.com/RackTables/racktables GitHub]. It includes the following notable branches:
;tags
+
;master
:The place for releases. Once a release have been copied here, its files '''must not''' be changed (with the only allowed exception of SVN metadata).
+
:The main development branch, that is, the default branch for all new changes.
;trunk
+
;maintenance-0.16.x
:This is where most of unstable commits happen.
+
;maintenance-0.17.x
;branches
+
;maintenance-0.18.x
:Branches are development lines, which can last up to several months, but eventually get deleted anyway (merged into the mainstream or not). A typical branch is "maintenance-0.X.Y", which is the place to commit bugfixes. These bugfixes become available by means of maintenance releases, and risky commits happen and get tested in trunk. Once the next stable line is ready, the old one becomes unmaintained and gets deleted.
+
;maintenance-0.19.x
 +
:Maintenance branches, that is, stable branches that serve as the base for RackTables releases.
  
 
== how to get a working copy of the source code ==
 
== how to get a working copy of the source code ==

Revision as of 10:36, 9 December 2013

the source code repository

RackTables project uses git as version control system for the source code. The git repository that is used to make "tar.gz" releases is currently hosted on GitHub. It includes the following notable branches:

master
The main development branch, that is, the default branch for all new changes.
maintenance-0.16.x
maintenance-0.17.x
maintenance-0.18.x
maintenance-0.19.x
Maintenance branches, that is, stable branches that serve as the base for RackTables releases.

how to get a working copy of the source code

# from the RackTables project repository
git clone git://github.com/RackTables/racktables.git
# or
git clone https://github.com/RackTables/racktables.git
# or
git clone ssh://git@github.com:RackTables/racktables.git

# from a GitHub fork (of your own or not)
git clone git://github.com/username/racktables.git
# or
git clone https://github.com/username/racktables.git
# or
git clone ssh://git@github.com:username/racktables.git

Note that the first two schemas (git:// and https://) are always read-only and the third (ssh://) may be read-only or read-write.

editing files

Use your favourite editor. Please consider existing code style: the default is to keep with Allman style (not with K&R, as was mistakenly stated here before). Indentation is always performed with tabs, please use any tab width you are comfortable with.

Here is an example of a function:

// take port list with order applied and return uplink ports in the same format
function produceUplinkPorts ($domain_vlanlist, $portlist)
{
	$ret = array();
	$employed = array();
	foreach ($domain_vlanlist as $vlan_id => $vlan)
		if ($vlan['vlan_type'] == 'compulsory')
			$employed[] = $vlan_id;
	foreach ($portlist as $port_name => $port)
		if ($port['vst_role'] != 'uplink')
			foreach ($port['allowed'] as $vlan_id)
				if (!in_array ($vlan_id, $employed))
					$employed[] = $vlan_id;
	foreach ($portlist as $port_name => $port)
		if ($port['vst_role'] == 'uplink')
		{
			$employed_here = array();
			foreach ($employed as $vlan_id)
				if (matchVLANFilter ($vlan_id, $port['wrt_vlans']))
					$employed_here[] = $vlan_id;
			$ret[$port_name] = array
			(
				'vst_role' => 'uplink',
				'mode' => 'trunk',
				'allowed' => $employed_here,
				'native' => 0,
			);
		}
	return $ret;
}

examining local unsaved changes

git status
git diff

submitting work

In the case of a GitHub fork of RackTables publishing changes is as simple as using git push. To merge your changes into the upstream RackTables notify the dev team by any convenient mean (GitGub pull request or email).

In the case of a private repository use a git format-patch command to produce a patch and send it to the developers.