Difference between revisions of "Committing policies"

From Gramps
Jump to: navigation, search
m
(Branches)
 
(17 intermediate revisions by 4 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 and cherry-picked to master.
 +
* Only new features should be committed to master directly.
 +
 
==Log messages==
 
==Log messages==
Every commit to Subversion 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:
  
 +
* The first line of the commit message should consist of a short summary of the change.  Maximum 70 characters.
 +
* 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.
 +
* 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.
 
* Messages should attempt to describe how the change affects the functionality from the user's perspective.
* It is not necessary to describe minute details about the change nor the files that are affected because that information is already stored by Subversion.
+
* Use complete sentences when possible.
* If the commit fixes a bug on the [http://bugs.gramps-project.org bug tracker], the log message shall include the bug ID and summary from the tracker.
+
* 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 log message shall list the contributor's name and email.
+
* 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 :-(
  
You can see the last changes with the svn 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:
  svn log -r BASE:10240 | head -n 40
+
  git log --oneline
Change 10240 to a more recent version to have the command take less time.
+
  
You can also limit the number of entries shown by passing in the '''--limit''' flag to svn. Add '''-v''' to see the files affected by the commit:
+
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:
  
  svn log --limit 5
+
  git log -5
 +
 
 +
To credit the contributor of a patch, use:
 +
 
 +
git commit -m 'Commit message' --author='A U Thor <author@example.com>'
  
 
==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.
  
All the files that need to be released '''must''' be listed in the Makefile.am in the same directory. Please remember to do this for new files that you add to SVN.
+
Please remember to do this for new files that you add to Git.
  
 
===Check===
 
===Check===
  
 
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
 
===Properties===
 
You'll also need to set several properties for new files.  For .py files, try the following:
 
svn propset svn:mime-type text/plain src/somefile.py
 
svn propset svn:eol-style native src/somefile.py
 
svn propset svn:keywords 'Id' src/somefile.py
 
  
 
==Removing files==
 
==Removing files==
Remember to remove references to the file from the po/POTFILES.in and Makefile.am 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 branch, it is the committer's responsibility to make sure the fix is also committed to the trunk. This can be accomplished using one of three methods. All methods require a working copy of trunk and the branch.
+
 
+
===Using svn merge===
+
The most common way to move changes between branches is by using the svn merge command. Assuming you have a working copy of trunk in ~/gramps/trunk and a working copy of the 3.3 branch in ~gramps/gramps{{stable_branch}}:
+
gramps{{stable_branch}}$ svn commit
+
gramps{{stable_branch}}$ cd ../trunk
+
trunk$ svn merge -c REVISION https://gramps.svn.sourceforge.net/svnroot/gramps/branches/maintenance/gramps{{stable_branch}}/
+
trunk$ svn commit
+
 
+
===Using svn diff===
+
You can also create a patch on gramps{{stable_branch}} branch and apply it to trunk:
+
gramps{{stable_branch}}$  svn diff -r PREV > ~/mypatch.patch
+
gramps{{stable_branch}}$  cd ../trunk
+
trunk$  patch -p0 < ~/mypatch.patch
+
 
+
Then you may have to fix things that could not be applied due to conflicts. The patch program would mark the conflicts with the <<<<<<, ======, and >>>>>> signs. You will then need to commit your changes:
+
trunk$  ./svnci
+
 
+
===Manually===
+
Make the change in the branch. Commit the change to the branch.
+
 
+
Make the change in trunk. Commit the change to trunk.
+
  
More info: http://svnbook.red-bean.com/
 
  
 
[[Category:Developers/General]]
 
[[Category:Developers/General]]

Latest revision as of 11:36, 26 May 2017

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 and cherry-picked to master.
  • 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:

  • The first line of the commit message should consist of a short summary of the change. Maximum 70 characters.
  • If the commit fixes a bug on the bug tracker, the summary shall include the bug ID and summary from the tracker.
  • 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.
  • 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 :-(

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 -m 'Commit message' --author='A U Thor <author@example.com>'

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.