org-contribute.org 11 KB

Types of contributions

Every contribution to Org is very welcome. Here is a list of areas where your contribution will be useful:

  • you can submit bug reports -- Before sending a bug report, make sure
  • you have read this section of Org's manual: [[http://orgmode.org/org.html#Feedback][Feedback]]
  • you can submit feature requests -- Org is already mature, but new
  • ideas keep popping up. If you want to request a feature, it might be a good idea to have a look at the current [[http://orgmode.org/worg/org-issues.php][Issue tracking file]] which captures both bug reports and feature requests. Or dig into the mailing list for possible previous discussions about your idea. If you cannot find back your idea, formulate it as detailed as possible, if possible with examples, and send it to the mailing list.
  • you can submit patches -- You can submit patches to the mailing list.

If your patch is against a file that is part of Emacs, then your total contribution (all patches you submit) should change less than 20 lines. If you contribute more, you have to assign the copyright of your contribution to the Free Software Foundation (see below).

  • you can submit Org add-ons -- there are many Org add-ons. The best way
  • is to submit your code to the mailing list to discuss it with people. If it is useful, you might consider contributing it to the =CONTRIB/= directory in the git repository.
  • you can submit material to the Worg website -- This website is made of
  • Org files that you can contribute to. Learn what Worg is [[file:worg-about.org][about]] and how to contribute to it [[file:worg-git.org][through git]].

Copyright issues when contributing to Emacs org-mode

Org is made of many files. Most of them are also distributed as part of GNU Emacs. These files are called the Org core, and they are all copyrighted by the Free Software Foundation, Inc. If you consider contributing to these files, your first need to grant the right to include your works in GNU Emacs to the FSF. For this you need to complete this form, send it to assign@gnu.org, and tell the Org-mode maintainer when this process is complete. Some people consider this a hassle. I don't want to discuss this in detail here - there are some good reasons for getting the copyright registered, an example is discussed in this FLOSS weekly podcast. Furthermore, by playing according to the Emacs rules, we gain the fantastic advantage that every version of Emacs ships with Org-mode already fully built in. So please consider doing this - it makes our work as maintainers so much easier, because we can then take your patches without any additional work.

If you want to learn more about why copyright assignments are collected, read this: Why the FSF gets copyright assignments from contributors?

Preferred way of submitting patches

Org-mode is developed using git as the version control system. Git provides an amazing framework to collaborate on a project. Git can be used to make patches and send them via email - this is perfectly fine for minor changes.

This command will make a patch between the staging area (in your computer), and the file you modified:

git diff -p org-whatever.el > org-whatever.el.diff

If you already committed your changes to your index (staging area), then you should compare against a particular branch (in this example, origin/master):

git diff -p origin/master org-whatever.el > org-whatever.el.diff

You email the output to the mailing list, adding [PATCH] to the subject, and description of what you fixed or changed.

These patches will be automatically registered at John Wiegley's patchwork server and will then be accepted, rejected, or sent back to the author with a request for modification.

For more significant contributions, the best way to submit patches is through public branches of your repository clone.

  1. Clone our git repository at http://repo.or.cz/w/org-mode.git
  1. Create a repository that can be publicly accessed, for example on
  2. /GitHub/, /repo.or.cz/, or on your own server.
  1. Push your topic branches (and optionally the master branch) to your
  2. public repository.

Define a remote for your public repository you push topics to.

git remote add REMOTE URL-GOES-HERE

Push branches to the remote

git push REMOTE BRANCH1 [BRANCH2 BRANCH3 ...]

e.g.

git remote add github ssh://.../     # Done once to define the remote 'github'
git push github my-topic
  1. Do your work on topic-specific branches, using a branch name that
  2. relates to what you are working on.
  1. Often do

git remote update

to pull commits from all defined remote repositories, in particular the org-mode master at repo.or.cz.

  1. When you have something workable, publish the git path and branch
  2. name on the mailing list, so that people can test it and review your work.
  1. After your topic has been merged to the project master branch you
  2. can delete the topic on your local and remote repositories.

git branch -d NEWTOPIC

git push REMOTE :NEWTOPIC

Commit messages and ChangeLog entries

We have decided to no longer keep a ChangeLog file to record changes to individual functions. In a modern version control system like git, ChangeLog is duplicating information that should be in the commit message, and it is the main cause of merge conflicts.

Instead, the change log entry should be part of the commit message. A commit message should be constructed in the following way:

  • Line 1 of the commit message should always be a short description of
  • the overall change. Line 1 does /not/ get a dot at the end.
  • Line 2 is an empty line
  • In line 3, the ChangeLog entry should start, in a similar format as
  • in the old ChangeLog files, but without the author information (which is part of the commit anyway).
  • After the changelog, another empty line should come before any
  • additional information that the committer wishes to provide in order to explain the patch.
  • If the change is a minor change made by a committer without
  • copyright assignment to the FSF, the commit message should also contain the cookie =TINYCHANGE= (anywhere in the message). When we later produce the ChangeLog file for Emacs, the change will be marked appropriately.

Here is an example for such a message

Capture: Fix the case of using a template file

,* lisp/org-capture.el (org-capture-set-plist): Make sure txt is a string before calling `string-match'. (org-capture-templates): Fix customization type. ,* doc/org.texi (Capture): Document using a file for a template

The problem here was that a wrong keyword was given in the customization type. This let to a string-match against a list value.

Modified from a patch proposal by Johan Friis.

TINYCHANGE

If you are using magit.el in Emacs, The ChangeLog-like such entries are easily made by pressing C in the diff listing. Another option to make the entries is to use `C-x 4 a' in the changed function. This will create entries in the ChangeLog file, and you can then cut and paste these to the commit message and remove the indentation.

Copyrighted contributors to Org-mode

Here is the list of people who have contributed actual code to the Org-mode core. Note that the manual contains a more extensive list with acknowledgments, including contributed ideas! The lists below are mostly for house keeping, to help the maintainers keep track of copyright issues.

Current contributors

:PROPERTIES: :CUSTOM_ID: contributors_with_fsf_papers :END:

Here is the list of people who signed the papers with the Free Software Foundation and can now freely submit code to Org files that are included within GNU Emacs:

  1. Russel Adams
  2. Benjamin Andresen
  3. Konstantin Antipin
  4. Julien Barnier
  5. Ian Barton
  6. Thomas Baumann
  7. Joel Boehland
  8. Jan Böker
  9. Lennart Borgman
  10. Tom Breton
  11. Andreas Burtzlaff
  12. Baoqiu Cui
  13. Sacha Chua
  14. Julien Danjou
  15. Dan Davison
  16. Carsten Dominik
  17. Stephen Eglen
  18. Christian Egli
  19. Adam Elliott
  20. Miguel A. Figueroa-Villanueva
  21. Mikael Fornius
  22. Eric S. Fraga
  23. Michael Gauland
  24. Daniel M German
  25. Manuel Giraud
  26. Nicolas Goaziou
  27. Bernd Grobauer
  28. Bastien Guerry
  29. Daniel M. Hackney
  30. Bernt Hansen
  31. Magnus Henoch
  32. Tomas Hlavaty
  33. Tassilo Horn
  34. Noorul Islam K M
  35. Erik Iverson
  36. Phil Jackson
  37. Peter Jones
  38. Tokuya Kameshima
  39. Richard Klinda
  40. Anthony Lander
  41. Christopher League
  42. Matt Lundin
  43. David Maus
  44. Nathan Neff
  45. Ross Patterson
  46. Juan Pechiar
  47. Martin Pohlack
  48. Jason Riedy
  49. Richard Riley
  50. Philip Rooke
  51. Sebastian Rose
  52. Eric Schulte
  53. Charles Sebold
  54. Paul Sexton
  55. James TD Smith
  56. Michael Sperber
  57. Ulf Stegemann
  58. Lukasz Stelmach
  59. Andy Steward
  60. Christopher Suckling
  61. David O'Toole
  62. Sebastien Vauban
  63. Zhang Weize
  64. John Wiegley
  65. Piotr Zielinski

Processing

These people have been asked to sign the papers, and they are currently considering it or a request is being processed by the FSF.

  1. Chris Gray

Tiny Changes

These people have submitted tiny change patches that made it into Org without FSF papers. When they submit more, we need to get papers eventually. The limit is a cumulative change of 20 non-repetitive change lines. Details are given in this document.

  1. Robert P. Goldman
  2. Andy Lutomirski

(this list may be incomplete - please help to complete it)

No FSF assignment

These people cannot or prefer to not sign the FSF copyright papers, and we can only accept patches that do not change the core files (the ones that are also in Emacs).

Luckily, this list is still empty.

Last update: 06-04-2010 16:29