README_maintainer 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274
  1. # -*- mode:org -*-
  2. #+title: Maintainer tasks
  3. #+startup: noindent
  4. This document describes the tasks the Org-mode maintainer has to do
  5. and how they are performed.
  6. * Working with patchwork
  7. John Wiegley is running a patchwork server that looks at the
  8. emacs-orgmode mailing list and extracts patches. The maintainer and
  9. his helpers should work through such patches, give feedback on them
  10. and apply the ones which are good and done. A task for the maintainer
  11. is to every now and then try to get old stuff out of that list, by
  12. asking some helpers to investigate the patch, by rejecting or
  13. accepting it.
  14. I have found that the best workflow for this is using the pw script by
  15. Nate Case, with the modifications for Org-mode made by John Wiegley
  16. and Carsten Dominik. The correct version of this script that should
  17. be used with Org mode is distributed in the UTILITIES directory of the
  18. Org mode distribution. Here is the basic workflow for this.
  19. ** Access to the patchwork server
  20. If you want to work on patchwork patches, you need write access at the
  21. patchwork server. You need to contact John Wiegley to get this
  22. access.
  23. There is a web interface to look at the patches and to change the
  24. status of patches. This interface is self-explanatory. There is also
  25. a command line script which can be very convenient to use.
  26. ** Testing patches
  27. To start testing a patch, first assign it to yourself
  28. : pw update -s "Under Review" -d DELEGATE-NAME NNN
  29. where =NNN= is a patch number and =DELEGATE-NAME= is your user name on
  30. the patchwork server.
  31. The get the patch into a branch:
  32. : pw branch NNN
  33. This will create a local topic branch in your git repository with the
  34. name =t/patchNNN=. You will also be switched to the branch so that
  35. you can immediately start testing it. Quite often small amends need
  36. to be made, or documentation has to be added. Also, many contributors
  37. do not yet provide the proper ChangeLog-like entries in the commit
  38. message for the patch. As a maintainer, you have two options here.
  39. Either ask the contributor to make the changes and resubmit the patch,
  40. or fix it yourself. In principle, asking to contributor to change the
  41. patch until it is complete is the best route, because it will educate
  42. the contributor and minimize the work for the maintainer. However,
  43. sometimes it can be less hassle to fix things directly and commit the
  44. changes to the same branch =t/patchNNN=.
  45. If you ask the contributor to make the changes, the patch should be
  46. marked on the patchwork server as "changes requested".
  47. : pw update -s "Changes Requested" -m "What to change" NNN
  48. This will send an email to the contributor and the mailing list with a
  49. request for changes. The =-m= message should not be more than one
  50. sentence and describe the requested changes. If you need to explain
  51. in more detail, write a separate email to the contributor.
  52. When a new version of the patch arrives, you mark the old one as
  53. superseded
  54. : pw update -s "Superseded" NNN
  55. and start working at the new one.
  56. ** Merging a final patch
  57. Once the patch has been iterated and is final (including the
  58. ChangeLog-like entries in the commit message), it should be merged.
  59. The assumption here is that the final version of the patch is given by
  60. the HEAD state in the branch =t/patchNNN=. To merge, do this:
  61. : pw merge -m "maintainer comment" NNN
  62. This will merge the patch into master, switch back to master and send
  63. an email to both contributor and mailing list stating that this change
  64. has been accepted, along with the comment given in the =-m= message.
  65. At some point you might then want to remove the topic branch
  66. : git branch -d t/patchNNN
  67. * Releases
  68. ** Main releases
  69. The release number for main releases look like this: =7.13=
  70. Main releases are made whenever Org is in a state where the feature
  71. set is consistent and we feel that the features that are implemented
  72. is something we want to support in the future.
  73. A major release turns the current state of the master branch into a
  74. release. The release process is a single make command:
  75. : make release TAG=7.13
  76. Before issuing this command, you should make sure that everything
  77. during the process will work right, you can do so by running
  78. : make testrelease TAG=7.13
  79. When this fails, make sure to clean up. =git reset --hard= if
  80. necessary, and check if there are unwanted files, directories, or
  81. branches left over from the testing.
  82. ** Minor releases
  83. The release number for minor releases look like this: =7.13.01=
  84. Minor releases are small amends to main releases. Usually they fix
  85. critical bugs discovered in a main release. Minor bugs are not
  86. fixed - they will be adressed in the next main release. Only the fix
  87. to the bug is bundled into a release, without the main development
  88. work going on in the master branch. Since the bug fix will also be
  89. needed in the master branch, usually the fix is made in master and
  90. then cherry-picked into maint. When this is done, a release is made
  91. from maint with this command:
  92. : make fixrelease TAG=7.13.01
  93. ** Updating release files on orgmode.org server
  94. As of 2011-01-15, these directives of the Makefile are meant to be
  95. used /from orgmode.org server/ and will copy the release files to the
  96. webserver directory.
  97. - ~$ make makerelease :: creates a =RELEASE/= directory containing
  98. manuals and release files (=org.tar.gz=, =org.zip=, etc.)
  99. - ~$ make sync_release :: copy the content of =RELEASE/= to the right
  100. location on the server
  101. - ~$ make sync_manuals :: copy the manuals from =doc/= to the right
  102. location on the server
  103. - ~$ make relup :: call the three directives described above.
  104. ** Between releases
  105. While working on master between releases, I used to use something like
  106. 7.02trans as the version string. I no longer do this. =M-x
  107. org-version= will spit ut complete version infor related to git, with
  108. the neares commit and tag. I you ever need to set a special version
  109. number, use this:
  110. : UTILITIES/set_version 7.02trans
  111. and commit the result. Note that the above command does not change
  112. the version string in the file from which Org's homepage is
  113. generated. To change that as well, you would use a =--all= flag. To
  114. change only this file, use =--only=.
  115. * Synchonization with Emacs
  116. This is still a significant headache. Some hand work is needed here.
  117. Emacs uses bzr. A useful introduction to bzr for Emacs developers can
  118. be found [[http://www.emacswiki.org/emacs/BzrForEmacsDevs][here]]. While I see all the advantages this would have, I
  119. cannot bring myself to switch away from git for my day-to-day work,
  120. because I know git so well, and because git seems to me as being much
  121. more powerful, conceptionally simple (once you have [[http://www.newartisans.com/2008/04/git-from-the-bottom-up.html][bent your head
  122. around it]]), and so much faster.
  123. So the way I have been doing things with Emacs is this:
  124. 1. I do not update the version in Emacs too often. Just once every
  125. few months - this is frequently enough for the Emacs release cycle.
  126. Care must be taken to get in a *new and stable* version shortly
  127. before Emacs goes into feature freeze and pretest, because that
  128. version is going to be in the wild for a long time.
  129. 2. I watch the Emacs diffs for changes made by the maintainers of
  130. Emacs in the org-mode files in Emacs. Any changes that come up
  131. there, I merge into the development version of Org-mode.
  132. Occasionally I do not do this, if I do not agree with a change.
  133. The changes go into Org /without/ a ChangeLog-like entry in the
  134. commit message. The reason for this is that we will later generate
  135. a ChangeLog file from our commit messages, and I do not want double
  136. ChangeLog entries in the Emacs ChangeLog file.
  137. 3. When I have made a release (usually I wait for the minor releases
  138. to stabilize), I *copy* org files into the Emacs repository. Yes,
  139. I do not merge, I copy. This has been the source of some problems
  140. in the past - Emacs developers are not happy when I accidentally
  141. overwrite changes they made. But I have not had the patience to
  142. work out a better mechanism, and I really dislike the idea that the
  143. version in Emacs starts diverging from my own.
  144. Careful: Copy /org.texi/ and /orgcard.tex/ into the right places,
  145. and also copy the lisp files with *two exceptions*: Do *not* copy
  146. /org-colview-xemacs.el/ and /org-install.el/. The former does not
  147. belong in Emacs. And the latter would actually be harmful because
  148. Emacs generates its own autoloads. The Emacs distribution contains
  149. an empty /org-install.el/, so that users can have =(require
  150. 'org-install)= in .emacs with no ill effects. So if you were to
  151. copy /org-install.el/, you would overwrite that empty placeholder
  152. file.
  153. 4. Generate the ChangeLog entries
  154. For this, I do in the org-mode git repository
  155. : UTILITIES/make_emacs_changelog release_7.02.05..release_7.03.02
  156. This will spit out ChangeLog entries (for the given commit range)
  157. that need to go into the ChangeLog files in Emacs. Org-mode
  158. contributes to 3 different ChangeLog files in Emacs:
  159. : lisp/org/ChangeLog (for lisp changes)
  160. : doc/misc/ChangeLog (for org.texi changes)
  161. : etc/ChangeLog (for refcard changes)
  162. When you run the =make_emacs_changelog= program, you will be
  163. prompted for a date in ISO format YYYY-MM-DD, this date will be
  164. used in the ChangeLog entries - Emacs developers want these dates
  165. to be the time when the change has been installed into Emacs, not
  166. the time when we made the change in our own repository. So all the
  167. ChangeLog entries will get the same date. You will also be
  168. prompted for the kind of ChangeLog you want to make, possible
  169. answers are =lisp=, =texi=, and =card=. The program will then
  170. select the correct entries for the specified ChangeLog file. If
  171. you don't like being prompted, you can give the date and type as
  172. second and third command line arguments to =make_emacs_changelog=,
  173. for example
  174. : UTILITIES/make_emacs_changelog release_7.02.05..release_7.03.02 2010-12-11 lisp
  175. These entries need to be added to the ChangeLog files in Emacs.
  176. You should, in the ChangeLog file, select the inserted region of
  177. new entries and do =M-x fill-region=, so that the entries are
  178. formatted correctly. I then do look through the entries quickly to
  179. make sure they are formatted properly, that the email addresses
  180. look right etc.
  181. 5. Commit the changes into the bzr repository and you are done. Emacs
  182. developers often look throught the commit and make minor changes -
  183. these need to be merged back into our own repo.
  184. * Updating the list of hooks on Worg
  185. The file /org-configs/org-hooks.org/ contains a list of all hooks in
  186. Org. This list has to be updated after hooks have been added or
  187. removed. The perl script /UTILITIES/list-hooks.pl/ creates the
  188. entire section "Hooks and Function variables", including its
  189. level-one headline. I guess babel code could be used to update this
  190. automatically, but I have not implemented this - I have been doing
  191. it by hand every few months.
  192. * Copyright assignments
  193. The maintainer needs to keep track of copyright assignments. Even
  194. better, find a volunteer to do this. The list of all contributors
  195. from who we have the papers is kept on Worg at
  196. http://orgmode.org/worg/org-contribute.php, so that committers can
  197. check if a patch can go into the core. The assignment process does
  198. not allways go smoothly, and it has happened several times that it
  199. gets stuck or forgotten at the FSF. Emails from the paper submitter
  200. have been ignored in the past, but an email from me as the
  201. maintainer of Org mode has usually fixed such cases within a few
  202. days.