Difference between revisions of "Development Process"

From GnuCash
Jump to: navigation, search
(Developing New Features: Clarify that bugs go to maint, include test merge to master in instructions, + some minor editorial changes.)
m (Marking a function as deprecated: Typo)
(15 intermediate revisions by 6 users not shown)
Line 11: Line 11:
 
Documentation should start before coding ...
 
Documentation should start before coding ...
  
New or reworked features should also be documented as it turns out, some bugs are a problem of communication between user and developer. If you do not have the resources to do the [[Documentation_Update_Instructions|documentation self]], you should at least assign a bugzilla entry to the documentation team with the essential information.
+
New or reworked features should also be documented as it turns out, some bugs are a problem of communication between user and developer. If you do not have the resources to [[Documentation_Update_Instructions|update the documentation]] yourself, you should at least assign a [[Bugzilla]] entry to the documentation team with the essential information.
  
 
==Branches==
 
==Branches==
Line 18: Line 18:
  
 
* ''master'' -- the main development branch
 
* ''master'' -- the main development branch
* ''<release>'' -- the current release branch(es)
+
* ''maint'' -- the current stable release branch.
  
Developers may also have other branches in use for development or bugfixing.  This is described later in this document.
+
When close to a major release there will be a third "interesting" branch:
 +
 
 +
* 'unstable'  -- the pre-release branch for the upcoming major release
 +
 
 +
Older release series are labelled with the release number, e.g. ''2.4''. Those branches are normally closed to new work shortly after a new ''maint'' branch is created from ''unstable'' at the beginning of a new release series.
 +
 
 +
Developers may also have other branches in use for development or bugfixing.  This is described later in this document. These will generally '''not''' be pushed to the main repository.
  
 
==Developing New Features==
 
==Developing New Features==
Line 26: Line 32:
 
All new development work should target the ''master'' branch.  This includes new features and enhancements.  Small changes can be commited directly to ''master''.  Larger features or architectural changes should happen on a feature-branch; once that feature is working it can get merged back into ''master''.
 
All new development work should target the ''master'' branch.  This includes new features and enhancements.  Small changes can be commited directly to ''master''.  Larger features or architectural changes should happen on a feature-branch; once that feature is working it can get merged back into ''master''.
  
Bug fixes should be built against the ''maint'' branch. Since we frequently merge the ''maint'' branch into ''master'', please do a test merge of ''maint'' into ''master'' in your local repository to ensure that your patch merges cleanly.
+
Bug fixes should be built against the ''maint'' branch. See [[#Fixing Bugs|Fixing Bugs]] below for details.
 
 
If it doesn't and you don't know what to do about it, say so on the bug report when you attach your patch so that a developer can help you asses the situation and decide how to resolve it.
 
  
 
At any particular time, ''master'' should be "as stable as possible".  We use feature branches to limit the risk that a feature never completes.  If development of a feature were done solely in ''master'' and that feature never got completed it could leave ''master'' in a state where it doesn't compile, or it fails the regression tests.
 
At any particular time, ''master'' should be "as stable as possible".  We use feature branches to limit the risk that a feature never completes.  If development of a feature were done solely in ''master'' and that feature never got completed it could leave ''master'' in a state where it doesn't compile, or it fails the regression tests.
Line 34: Line 38:
 
If you are at all questioning whether to develop directly in ''master'' or in a branch, do it in a branch.
 
If you are at all questioning whether to develop directly in ''master'' or in a branch, do it in a branch.
  
As a general rule, development branches should ''not'' be pushed back to the main repository. If one needs to publish a development branch, fork the [https://github.com/Gnucash/gnucash Github repository] to your personal account and publish the branch there. This carries a cost, though: Merging a private branch will put all of the changes into a single "merge commit" and that will be all of the history on the main repository. For [[#Major Changes|major changes]] it is better to rebase a series of changes into ''master''.
+
As a general rule, development branches should ''not'' be pushed back to the main repository. If one needs to publish a development branch, fork the [https://github.com/Gnucash/gnucash Github repository] to your personal account and publish the branch there.
  
 
===Minor Changes===
 
===Minor Changes===
Line 44: Line 48:
 
Use your judgement about whether your major change should be done directly on ''master/maint'' or whether you should use a feature branch.  We trust you.  Just remember, smaller changesets are easier to audit. When possible try to ensure that each commit can compile; that makes it much easier to bisect when tracking down a regression.
 
Use your judgement about whether your major change should be done directly on ''master/maint'' or whether you should use a feature branch.  We trust you.  Just remember, smaller changesets are easier to audit. When possible try to ensure that each commit can compile; that makes it much easier to bisect when tracking down a regression.
  
==Backwards-Incompatible Schema Changes==
+
===Backwards-Incompatible Schema Changes===
  
 
To make the policy clearer, backwards-incompatible schema changes in an unstable release, e.g. 2.5, require a change to the previous stable release, e.g. 2.4, to provide a read facility for the new schema.
 
To make the policy clearer, backwards-incompatible schema changes in an unstable release, e.g. 2.5, require a change to the previous stable release, e.g. 2.4, to provide a read facility for the new schema.
  
 
Often it is easier to add a new KVP which will be simply ignored by older versions than to change the schema. But then it would become harder to get the [http://en.wikipedia.org/wiki/Database_normalization database normalized] for the SQL backend.
 
Often it is easier to add a new KVP which will be simply ignored by older versions than to change the schema. But then it would become harder to get the [http://en.wikipedia.org/wiki/Database_normalization database normalized] for the SQL backend.
 +
 +
===LibGnuCash API Stability===
 +
<!-- The discussion leading to this section may be found at https://wiki.gnucash.org/logs/2018/08/06.html#T13:04:30 -->
 +
Historically GnuCash has been developed as a stand-alone library with no concern for stability or backwards compatibility of the core API in spite of simultaneously insisting that the only safe way to operate on GnuCash data is to write code using the somewhat published API in C, Scheme, or Python. Over the first 20 years or so API has mostly been added and seldom pruned, so at as we get into converting more interesting components to C++ it's time to clean up and de-duplicate the API.
 +
 +
As far as we're able to tell no-one has ever written a consumer of the GnuCash C API outside of GnuCash itself, so during the conversion we're not going to worry about it. Everything that isn't Gui or Report will be rewritten in C++ and the C++ API will be new, and once it's internally stable we can begin to treat it like a real library with API guarantees. The C API necessary to interact with the Gtk GUI will remain as long as we retain the latter but there will be no stability guarantee for that part.
 +
 +
The bindings are another matter entirely. Much of the existing C API is also exported to Scheme and Python via SWIG. We know of many cases where users have written custom reports and a few cases of users writing Python extensions. Those users deserve reasonable stability in the API, hence the following policy.
 +
 +
====Policy====
 +
* Functions must not change signature (except in C++ which supports overloading). If one needs to do the same thing with different types, make a new function with a different name.
 +
* Functions may only be deleted in the master branch. Functions to be deleted must first be marked deprecated in the maint branch at least 6 months before the major release.
 +
* Deprecated functions should be rewritten as wrappers of their replacement functions. If the function is no longer needed in the C library the wrapper should be in the SWIG interface file (e.g. <tt>engine.i</tt>).
 +
 +
====Marking a function as deprecated====
 +
* C: <tt>__attribute__((deprecated))</tt> (gcc/clang) or <tt>__declspec(deprecated("explanation/redirection string"))</tt> (Visual Studio)
 +
* C++: <tt><nowiki>[[deprecated("explanation/redirection string")]]</nowiki></tt> (Requires C++14, use the C method in maint)
 +
* Python:  <tt>warnings.warn("explanation/redirection string", DeprecationWarning, stacklevel=2)</tt>
 +
* Scheme: <tt>(issue-deprecation-warning "explanation/redirection string")</tt>
 +
 +
'''Python Note:''' <tt>DeprecationWarnings</tt> are disabled by default, so developers of Python programs using GnuCash bindings should test by invoking python with <tt>-Wd</tt> or setting <tt>PYTHONWARNINGS=default</tt> in the shell environment.
  
 
==Fixing Bugs==
 
==Fixing Bugs==
  
Contrary to some beliefs, bug fixing is still development; it's just a different type of development. Indeed, whenever a bug exists that bug most likely exists in all branches, so it should get fixed in all branches. Therefore, the bugfix process should provide a way to fix a bug in ''trunk'' and, when necessary or appropriate, also on release branches.
+
In general bug fixes should always target the oldest active branch that features the bug. If the bug is present in the current stable version of gnucash, the bug should be fixed on ''maint'' (or a sub branch thereof). If the bug exists only in the development version of gnucash, the bug should be fixed on ''master'' only.
 +
 
 +
The exception here would be a bug in the stable branch for which the fix itself is a very complex or large body of code. Since this code has a higher risk of introducing new bugs in itself it should not be applied on the ''maint'' branch. Instead such a bug can only be fixed on the ''master'' branch (unstable version).
 +
 
 +
Since we frequently merge the ''maint'' branch into ''master'', please do a test merge of ''maint'' into ''master'' in your local repository to ensure that your patch merges cleanly.  
 +
 
 +
If it doesn't and you don't know what to do about it, say so on the bug report when you attach your patch so that a developer can help you asses the situation and decide how to resolve it.
 +
 
 +
===Bugfix Branches===
 +
 
 +
Many times a bugfix is simple.  In that case the bug can be fixed directly on the ''maint'' branch and the changeset can be merged forward to the ''master'' branch so future major releases carry it as well.
 +
 
 +
If the bugfix is sufficiently complicated then that bugfix warrants a bugfix branch.  The developer can create a branch off the release branch (''maint'') to work on the bugfix, and once that's been tested that branch can be merged back into the release branch.
 +
 
 +
==Release Version Numbering==
 +
 
 +
GnuCash uses two version number schemes:
 +
* For versions up through 2.7.8, each GnuCash version number consists of 3 numbers separated by a period, in format '''Fundamental.Major.Bugfix''' E.g. 2.4.11
 +
* Beginning with version 3.0, released in April 2018, each version number consists of only 2 integers separated by a period,
 +
meaning '''Major.Minor''', e.g. 3.1.
  
Fixing bugs leads to its own set of issues, especially due to the fact that ''trunk'' will diverge from the release branches.  Some may think that it would be easier to just commit bugfixes directly to the release branch and then merge back into ''trunk'', but while this might require fewer command-line operations, it has many pitfalls.
 
  
===Pitfalls of fixing directly on a release branch===
+
===Fundamental===
  
* it requires unvetted changes be committed to the release branch
+
The only fundamental change, from 1 to 2, involved changing most of the code from Scheme to C and upgrading the GUI from Gtk1 to Gtk2. Since we used this so infrequently we decided to switch to a two-number release.
* it fails to work well if we have multiple release branches
 
* as ''master'' diverges, the merging can become even more challenging.  While cherry-picking changesets to pull into a release branch requires typing more commands, merging a large set of changes from the release branch back into ''master'' can become a huge tangled mess if any of the changes don't apply cleanly.
 
* when looking at a change in ''master'' to see why a line of code changed '''git blame''' would only show that the change came from a "merge from stable branch" instead of showing who actually made the change or why.
 
  
It is true that as ''master'' diverges some bugfixes might require a lot of work to "backport" to the release branch (assuming that the fix even IS a backport).  In that case, the developer should use a bugfix branch (based off the release branch) to work on the fix.  However, that same bugfix if made in the release branch would require the same amount of work to merge into ''master'' so it's not saving any work to do it that way, and there are many drawbacks to the approach.
+
===Major===
  
===Bugfix Branches===
+
Major releases are planned every 2 - 4 years. See [[Release_Schedule|the Release Schedule]] for the development teams forecast.
  
Many times a bugfix is simple and the code has not diverged.  In that case the bug can be fixed on ''master'' and the changeset can be merged (cherry picked) directly onto the release branch.  This will happen more often than not early on in the development cycle because ''master'' and the release started the same.  As time goes on it may happen less often depending on the actual change and how much the code has diverged.
+
There are 2 types of Major releases, Stable and Unstable.
  
If the code has diverged enough that a simple bugfix can't be applied, or the bugfix is sufficiently complicated, then that bugfix warrants a bugfix branch.  The developer can create a branch off the release branch to work on the bugfix, and once that's been tested that branch can be merged back into the release branch.  Note that the bug should STILL be fixed in ''master'' first.
+
====Stable====
  
===Changeset Auditing Process===
+
:Stable releases are intended for use by users with their live data. They have one or two-digit minor versions, e.g. 3.1 or 3.21.
  
All changes to a release branch must be audited.
+
====Unstable====
* Before any changes may be made to a release branch, the changeset should exist either in ''master'' (if it's a simple fix) or a specific bugfix branch (if the changeset is complicated enough that it just can't apply cleanly).  This way the change is already in [[Git]] and has a chance to be vetted before pulled onto the release branch.
 
  
* Developers should request changesets get audited and approved before they are pulled into the release branch.  You can tag a changeset for audit by putting '''BP''' on a line by itself in your commit log. ("BP" stands for "BackPort"). Make sure the '''BP''' is on a line by itself with no surrounding whitespace.  Once upon a time, the '''commit-hook''' would send an extra email to gnucash-devel requesting that the change be audited, but that's been commented out. It still adds [Audit] to the front of the subject line of the commit email.
+
:Unstable release numbers have three digit minor versions beginning with 900, e.g. 3.902.
  
* Provided the audit is approved, or more likely no-one objects, then the changes can be added to the release branch.
+
:Unstable releases are the precursors to a stable release, and are intended only for testing, by either developers or interested community members who don't have the time or skills to build GnuCash from source. They are meant to expose the developers' work to a wide audience, so changes can be tested in a range of environments, before being included in a stable release.
**Git svn users can, after checking out the release branch, run the script util/git-backport.sh <svn release number>.  It will look up the SHA using git svn find-rev, then cherry-pick and modify the commit message.  Also, if your local username ("whoami") is different from the SVN username, you can set the environment variable WHOAMI to your SVN username. This is used to decide whether a line saying "Original commit by ..." is appended as well.
 
  
* Any change that gets requested to merge onto a release branch should have an associated entry in [[Bugzilla]]. The bug should contain the changeset number with the bugfix in ''trunk'' (or the name of the bugfix branch).
+
:Unstable releases come late in a major development cycle. By the time unstable releases are issued, relevant longer term modifications should be nearly done (except for some bug fixing).
  
** If you audit a changeset and believe that it is safe for backporting and does not introduce other bugs (i.e., you've tested it and haven't noticed new issues) then you should add a comment in the bug report and/or respond to the audit-request email.
+
:Unstable releases are very short-lived, normally only six months or so, with new releases every month and a final pre-stable release two weeks before the stable release. If a significant problem surfaces in that last release, the developers will focus on that problem and do another pre-stable with the stable to follow two weeks later.
  
** Releases can have a catch-all bug to keep as a blocker dependency of all audit-changeset bugs. (The last time this was used was for 2.2.0,  [http://bugzilla.gnome.org/show_bug.cgi?id=486922 Bug #486922]). When you request an audit for a change which fixes a bug, you make the bug a blocker of the catch-all.  Once the requested and audited change is pulled into the release branch (or rejected) the bug will get closed.
+
:Due to the possibility of data corruption, unstable releases should only be used on a '''copy''' of live GnuCash data.
  
** Alternatively, set the milestone on the bug to the next stable release. When the change is rejected  for backport, the developer rejecting it can close the bug; if it's accepted, the bug should be closed by whoever commits the backport.
+
===Minor===
  
==Changes on the Build System==
+
Minor releases are made typically every 3 months; see [[Release_Schedule|the Release Schedule]]. Minor releases contain fixes to reported problems and small features that the development team consider low risk for incompatibility.
  
See [[Build System#Changes on the Build System]].
+
Minor releases should never break file compatibility with other releases in the same major version.
  
 
==Updating Translations==
 
==Updating Translations==
  
Translations are "special". [[Translation]] updates can be made directly into the po directory of the release branch.
+
[[Translation]]s are "special". [[Translation Status]] shows the current state.
 +
 
 +
 
 +
[[Category:Development]]
 +
[[Category:Translation]]

Revision as of 14:50, 30 August 2018

This page describes the development process for developing GnuCash code. It talks about how we use Git and in particular how we use branches to manage the GnuCash source code and release process.

Development Process Goals

The goal of this process is to limit the number of potential bugs that enter the stable release branch(es) due to changes made to the sources. We want to make sure that changes made to releases have been audited and vetted BEFORE they are commited to the release branches. At the same time we want to try to keep the main development branch as stable as practical.

In particular, we want to prevent "bad releases". Those are releases where a bugfix inadvertantly breaks other code.

Documentation

Documentation should start before coding ...

New or reworked features should also be documented as it turns out, some bugs are a problem of communication between user and developer. If you do not have the resources to update the documentation yourself, you should at least assign a Bugzilla entry to the documentation team with the essential information.

Branches

Branches in Git are cheap, therefore we should use branches to our advantage. There are always two "interesting" branches in use:

  • master -- the main development branch
  • maint -- the current stable release branch.

When close to a major release there will be a third "interesting" branch:

  • 'unstable' -- the pre-release branch for the upcoming major release

Older release series are labelled with the release number, e.g. 2.4. Those branches are normally closed to new work shortly after a new maint branch is created from unstable at the beginning of a new release series.

Developers may also have other branches in use for development or bugfixing. This is described later in this document. These will generally not be pushed to the main repository.

Developing New Features

All new development work should target the master branch. This includes new features and enhancements. Small changes can be commited directly to master. Larger features or architectural changes should happen on a feature-branch; once that feature is working it can get merged back into master.

Bug fixes should be built against the maint branch. See Fixing Bugs below for details.

At any particular time, master should be "as stable as possible". We use feature branches to limit the risk that a feature never completes. If development of a feature were done solely in master and that feature never got completed it could leave master in a state where it doesn't compile, or it fails the regression tests.

If you are at all questioning whether to develop directly in master or in a branch, do it in a branch.

As a general rule, development branches should not be pushed back to the main repository. If one needs to publish a development branch, fork the Github repository to your personal account and publish the branch there.

Minor Changes

Developers with the requisite privs may push minor changes directly to master or to maint as appropriate without a feature branch.

Major Changes

Use your judgement about whether your major change should be done directly on master/maint or whether you should use a feature branch. We trust you. Just remember, smaller changesets are easier to audit. When possible try to ensure that each commit can compile; that makes it much easier to bisect when tracking down a regression.

Backwards-Incompatible Schema Changes

To make the policy clearer, backwards-incompatible schema changes in an unstable release, e.g. 2.5, require a change to the previous stable release, e.g. 2.4, to provide a read facility for the new schema.

Often it is easier to add a new KVP which will be simply ignored by older versions than to change the schema. But then it would become harder to get the database normalized for the SQL backend.

LibGnuCash API Stability

Historically GnuCash has been developed as a stand-alone library with no concern for stability or backwards compatibility of the core API in spite of simultaneously insisting that the only safe way to operate on GnuCash data is to write code using the somewhat published API in C, Scheme, or Python. Over the first 20 years or so API has mostly been added and seldom pruned, so at as we get into converting more interesting components to C++ it's time to clean up and de-duplicate the API.

As far as we're able to tell no-one has ever written a consumer of the GnuCash C API outside of GnuCash itself, so during the conversion we're not going to worry about it. Everything that isn't Gui or Report will be rewritten in C++ and the C++ API will be new, and once it's internally stable we can begin to treat it like a real library with API guarantees. The C API necessary to interact with the Gtk GUI will remain as long as we retain the latter but there will be no stability guarantee for that part.

The bindings are another matter entirely. Much of the existing C API is also exported to Scheme and Python via SWIG. We know of many cases where users have written custom reports and a few cases of users writing Python extensions. Those users deserve reasonable stability in the API, hence the following policy.

Policy

  • Functions must not change signature (except in C++ which supports overloading). If one needs to do the same thing with different types, make a new function with a different name.
  • Functions may only be deleted in the master branch. Functions to be deleted must first be marked deprecated in the maint branch at least 6 months before the major release.
  • Deprecated functions should be rewritten as wrappers of their replacement functions. If the function is no longer needed in the C library the wrapper should be in the SWIG interface file (e.g. engine.i).

Marking a function as deprecated

  • C: __attribute__((deprecated)) (gcc/clang) or __declspec(deprecated("explanation/redirection string")) (Visual Studio)
  • C++: [[deprecated("explanation/redirection string")]] (Requires C++14, use the C method in maint)
  • Python: warnings.warn("explanation/redirection string", DeprecationWarning, stacklevel=2)
  • Scheme: (issue-deprecation-warning "explanation/redirection string")

Python Note: DeprecationWarnings are disabled by default, so developers of Python programs using GnuCash bindings should test by invoking python with -Wd or setting PYTHONWARNINGS=default in the shell environment.

Fixing Bugs

In general bug fixes should always target the oldest active branch that features the bug. If the bug is present in the current stable version of gnucash, the bug should be fixed on maint (or a sub branch thereof). If the bug exists only in the development version of gnucash, the bug should be fixed on master only.

The exception here would be a bug in the stable branch for which the fix itself is a very complex or large body of code. Since this code has a higher risk of introducing new bugs in itself it should not be applied on the maint branch. Instead such a bug can only be fixed on the master branch (unstable version).

Since we frequently merge the maint branch into master, please do a test merge of maint into master in your local repository to ensure that your patch merges cleanly.

If it doesn't and you don't know what to do about it, say so on the bug report when you attach your patch so that a developer can help you asses the situation and decide how to resolve it.

Bugfix Branches

Many times a bugfix is simple. In that case the bug can be fixed directly on the maint branch and the changeset can be merged forward to the master branch so future major releases carry it as well.

If the bugfix is sufficiently complicated then that bugfix warrants a bugfix branch. The developer can create a branch off the release branch (maint) to work on the bugfix, and once that's been tested that branch can be merged back into the release branch.

Release Version Numbering

GnuCash uses two version number schemes:

  • For versions up through 2.7.8, each GnuCash version number consists of 3 numbers separated by a period, in format Fundamental.Major.Bugfix E.g. 2.4.11
  • Beginning with version 3.0, released in April 2018, each version number consists of only 2 integers separated by a period,

meaning Major.Minor, e.g. 3.1.


Fundamental

The only fundamental change, from 1 to 2, involved changing most of the code from Scheme to C and upgrading the GUI from Gtk1 to Gtk2. Since we used this so infrequently we decided to switch to a two-number release.

Major

Major releases are planned every 2 - 4 years. See the Release Schedule for the development teams forecast.

There are 2 types of Major releases, Stable and Unstable.

Stable

Stable releases are intended for use by users with their live data. They have one or two-digit minor versions, e.g. 3.1 or 3.21.

Unstable

Unstable release numbers have three digit minor versions beginning with 900, e.g. 3.902.
Unstable releases are the precursors to a stable release, and are intended only for testing, by either developers or interested community members who don't have the time or skills to build GnuCash from source. They are meant to expose the developers' work to a wide audience, so changes can be tested in a range of environments, before being included in a stable release.
Unstable releases come late in a major development cycle. By the time unstable releases are issued, relevant longer term modifications should be nearly done (except for some bug fixing).
Unstable releases are very short-lived, normally only six months or so, with new releases every month and a final pre-stable release two weeks before the stable release. If a significant problem surfaces in that last release, the developers will focus on that problem and do another pre-stable with the stable to follow two weeks later.
Due to the possibility of data corruption, unstable releases should only be used on a copy of live GnuCash data.

Minor

Minor releases are made typically every 3 months; see the Release Schedule. Minor releases contain fixes to reported problems and small features that the development team consider low risk for incompatibility.

Minor releases should never break file compatibility with other releases in the same major version.

Updating Translations

Translations are "special". Translation Status shows the current state.