Difference between revisions of "Committing policies"

From Gramps
Jump to: navigation, search
m (Log messages)
(Pull requests)
(10 intermediate revisions by 3 users not shown)
Line 1: Line 1:
 +
==Branches==
 +
* Only new features should be committed to the master branch.
 +
* Only bug fixes should be committed to maintenance branches.
 +
* The current maintenance branch should be merged regularly into the master branch.
 +
* Translations may be committed to any active branch.
 +
 +
==Merging==
 +
* Most changes should be squashed and fast-forwarded.
 +
* Major new features should be merged no-ff to maintain their development identity.
 +
* This applies both to pull requests and to work by developers with write permission to the repository.
 +
 +
==Pull requests==
 +
* Pull requests must be code-reviewed and tested by a developer.
 +
* PR authors should not be assumed to be Git experts, so it's up to the Gramps developer doing the merge to ensure that the PR is clean and won’t make a mess of history.
 +
* The GitHub "Squash and merge" button can be used for most small changes.
 +
* A no-ff merge outside of GitHub should be used when it is useful to keep the commit history.
 +
* Bug fixes must be committed to the current stable branch.
 +
* Only new features should be committed to master directly.
 +
 
==Log messages==
 
==Log messages==
 
Every commit to Git must be accompanied by a log message. These messages will be generated into a ChangeLog when a release is made and should conform to the following guidelines:
 
Every commit to Git must be accompanied by a log message. These messages will be generated into a ChangeLog when a release is made and should conform to the following guidelines:
  
 +
===Summary===
 
* The first line of the commit message should consist of a short summary of the change.
 
* The first line of the commit message should consist of a short summary of the change.
* If the commit fixes a bug on the [http://bugs.gramps-project.org bug tracker], the summary shall include the bug ID and summary from the tracker.
+
* Maximum 70 characters.
* The summary should be separated from the body of the message by a single blank line.
+
 
* Messages should attempt to describe how the change affects the functionality from the user's perspective.
+
===Description===
 +
* The description should be separated from the summary by a single blank line.
 +
* Attempt to describe how the change affects the functionality from the user's perspective.
 
* Use complete sentences when possible.
 
* Use complete sentences when possible.
 
* It is not necessary to describe minute details about the change nor the files that are affected because that information is already stored by Git and can be viewed with "git diff".
 
* It is not necessary to describe minute details about the change nor the files that are affected because that information is already stored by Git and can be viewed with "git diff".
 
* When committing contributed code, the author should be credited using the --author option.
 
* When committing contributed code, the author should be credited using the --author option.
* If you want to refer to another commit, use the commit short hash (6 hexa digits) in square brackets. It will automatically be expanded to a hyperlink by the SourceForge web interface to the repository, e.g.: [http://sourceforge.net/p/gramps/source/ci/d8acf8e875a06cf89b2cc4d59ed63730539244af/ [d8acf8]]. Note: the default short hash in git is 7 hexa digits (as produced by `git log --oneline' command), and that WILL NOT WORK with auto-hyperlinking of sourceforge :-(
+
* If you want to refer to another commit, use the full commit hash. It will automatically be converted into a hyperlink by the GitHub web interface. Note: a 6 hexa digit hash enclosed in brackets WILL NOT WORK with GitHub auto-hyperlinking :-(
 +
 
 +
===Bug tracker integration===
 +
Special keywords can be used to either link to, or resolve, bug reports. They should be separated from the description by a single blank line.
 +
 
 +
To resolve a bug or bugs use:
 +
 
 +
* Fixes #12345
 +
* Fixed #12345
 +
* Resolves #12345
 +
* Resolved #12345
 +
* Fixes #12345, #67890
 +
* Fixed #12345, #67890
 +
* Resolves #12345, #67890
 +
* Resolved #12345, #67890
 +
 
 +
To link to a bug or bugs use:
 +
 
 +
* Bug #12345
 +
* Issue #12345
 +
* Report #12345
 +
* Bugs #12345, #67890
 +
* Issues #12345, #67890
 +
* Reports #12345, #67890
 +
 
 +
For this to work, either the author or committer will need to be a developer on the Mantis bug tracker. The Git name must match either the Mantis username or real name, or the Git email must match the Mantis email.
  
 +
===Useful commands===
 
You can see the last changes with the git log command, an example usage of this command:
 
You can see the last changes with the git log command, an example usage of this command:
 
  git log --oneline
 
  git log --oneline
Line 20: Line 68:
 
To credit the contributor of a patch, use:
 
To credit the contributor of a patch, use:
  
  git commit -m 'Commit message' --author='A U Thor <[email protected]>'
+
  git commit --author='A U Thor <[email protected]>'
  
 
==Adding new files==
 
==Adding new files==
All the files with the translatable strings '''must''' be listed in the po/POTFILES.in or po/POTFILES.skip files. This means that most new files must have their names added to these files.
+
All the files with the translatable strings '''must''' be listed in the <code>po/POTFILES.in</code> or <code>po/POTFILES.skip</code> files. This means that most new files must have their names added to these files.
  
 
Please remember to do this for new files that you add to Git.
 
Please remember to do this for new files that you add to Git.
Line 30: Line 78:
  
 
You can make a test on a local copy:
 
You can make a test on a local copy:
./autogen.sh
+
  PYTHONPATH=../../gramps python po/test/po_test.py
  PYTHONPATH=../../trunk/src python po/test/po_test.py
 
  
 
where ../.. is the path to your local copy
 
where ../.. is the path to your local copy
  
 
==Removing files==
 
==Removing files==
Remember to remove references to the file from the po/POTFILES.in and po/POTFILES.skip files.
+
Remember to remove references to the file from the <code>po/POTFILES.in</code> and <code>po/POTFILES.skip</code> files.
  
==Bugfixes in branches==
 
Whenever a bug is fixed in a maintenance branch, it is the committer's responsibility to make sure the fix is also committed to the master branch. See the [[Brief introduction to Git#Applying a fix to another branch|Brief introduction to Git]] for details.
 
  
 
[[Category:Developers/General]]
 
[[Category:Developers/General]]

Revision as of 21:24, 18 April 2018

Branches

  • Only new features should be committed to the master branch.
  • Only bug fixes should be committed to maintenance branches.
  • The current maintenance branch should be merged regularly into the master branch.
  • Translations may be committed to any active branch.

Merging

  • Most changes should be squashed and fast-forwarded.
  • Major new features should be merged no-ff to maintain their development identity.
  • This applies both to pull requests and to work by developers with write permission to the repository.

Pull requests

  • Pull requests must be code-reviewed and tested by a developer.
  • PR authors should not be assumed to be Git experts, so it's up to the Gramps developer doing the merge to ensure that the PR is clean and won’t make a mess of history.
  • The GitHub "Squash and merge" button can be used for most small changes.
  • A no-ff merge outside of GitHub should be used when it is useful to keep the commit history.
  • Bug fixes must be committed to the current stable branch.
  • Only new features should be committed to master directly.

Log messages

Every commit to Git must be accompanied by a log message. These messages will be generated into a ChangeLog when a release is made and should conform to the following guidelines:

Summary

  • The first line of the commit message should consist of a short summary of the change.
  • Maximum 70 characters.

Description

  • The description should be separated from the summary by a single blank line.
  • Attempt to describe how the change affects the functionality from the user's perspective.
  • Use complete sentences when possible.
  • It is not necessary to describe minute details about the change nor the files that are affected because that information is already stored by Git and can be viewed with "git diff".
  • When committing contributed code, the author should be credited using the --author option.
  • If you want to refer to another commit, use the full commit hash. It will automatically be converted into a hyperlink by the GitHub web interface. Note: a 6 hexa digit hash enclosed in brackets WILL NOT WORK with GitHub auto-hyperlinking :-(

Bug tracker integration

Special keywords can be used to either link to, or resolve, bug reports. They should be separated from the description by a single blank line.

To resolve a bug or bugs use:

  • Fixes #12345
  • Fixed #12345
  • Resolves #12345
  • Resolved #12345
  • Fixes #12345, #67890
  • Fixed #12345, #67890
  • Resolves #12345, #67890
  • Resolved #12345, #67890

To link to a bug or bugs use:

  • Bug #12345
  • Issue #12345
  • Report #12345
  • Bugs #12345, #67890
  • Issues #12345, #67890
  • Reports #12345, #67890

For this to work, either the author or committer will need to be a developer on the Mantis bug tracker. The Git name must match either the Mantis username or real name, or the Git email must match the Mantis email.

Useful commands

You can see the last changes with the git log command, an example usage of this command:

git log --oneline

You can also limit the number of entries shown by passing in the -n flag to git. Add --stat to see the files affected by the commit:

git log -5

To credit the contributor of a patch, use:

git commit --author='A U Thor <[email protected]>'

Adding new files

All the files with the translatable strings must be listed in the po/POTFILES.in or po/POTFILES.skip files. This means that most new files must have their names added to these files.

Please remember to do this for new files that you add to Git.

Check

You can make a test on a local copy:

PYTHONPATH=../../gramps python po/test/po_test.py

where ../.. is the path to your local copy

Removing files

Remember to remove references to the file from the po/POTFILES.in and po/POTFILES.skip files.