-
-
Save nothingmuch/144048 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
=pod | |
=head1 NAME | |
Moose::Manual::Contributing - How to get involved in Moose | |
=head1 GETTING INVOLVED | |
Moose is a pretty open project and we are always willing to accept bug fixes, | |
more tests and documentation patches. Commit bits are given out freely, and | |
the STANDARD WORKFLOW is very simple. The general gist is clone the Git | |
repository, create a new topic branch, hack away, then find a committer to | |
review your changes. | |
=head1 PEOPLE: | |
As Moose has matured some structure has emerged in the process. | |
=over | |
=item Contributors - people creating a topic or branch | |
You. | |
If you have commit access you can create a topic on the main Moose.git, | |
otherwise either give us your SSH key or create your own fork of the | |
GitHub mirror. | |
=item Core Comitters - people reviewing and merging a branch | |
These people have worked with the Moose codebase for a while. | |
They've been responsible for large features or branches and can help review | |
your changes and apply them to the master branch. | |
They are also fairly well versed in Git, in order to merge the branches with | |
no mistakes (especially when the merge fails), and to provide advice to | |
contributers. | |
=item Cabal - people who can release moose | |
These people are the ones who have co-maint on Moose itself and can create a | |
release. They're listed under CABAL in the Moose documentation. They merge | |
from Master to Stable. | |
=back | |
=head1 NEW FEATURES | |
Moose already has a fairly large feature set and we are currently | |
B<not> looking to add any major new features to it. If you have an | |
idea for a new feature in Moose, you are invited instead to create a | |
MooseX module first. | |
At this stage, no new features will even be considered for addition | |
into the core without first being vetted as a MooseX module, unless | |
it is absolutely 100% impossible to implement the feature outside the | |
core. | |
If you think it is 100% impossible, please come discuss it with us on IRC or | |
via Email. However, your feature may need a small hook in the core, or a | |
refactoring of some core modules, and we are definitely open to that. | |
Moose was built from the ground up with the idea of being highly | |
extensible, and quite often the feature requests we see can be | |
implemented through a couple of small and well placed extensions. Try | |
it, it is much easier then you might think. | |
=head1 BRANCH LAYOUT | |
=over | |
=item Stable (refs/heads/stable) | |
The branch that releases are made off of. When making a new release the | |
release manager merges from master to stable. Only updated by someone | |
from the Cabal during a release. | |
=item Master (refs/heads/master) | |
The branch new development. This branch is merged into and branched from. | |
=item Branches (refs/heads/*) | |
Large community branches for big development "projects". | |
=item Topics (refs/heads/topics/*) | |
Small personal branches that have been published for review, but can get | |
freely rebased. Targetted features that may span a handful of commits. | |
Any change or bugfix should be created in a topic branch. | |
=back | |
=head1 STANDARD WORKFLOW | |
# update your copy of master | |
git checkout master | |
git pull --rebase | |
# create a new topic branch | |
git checkout -b topic/my_feature | |
# hack, commit, feel free to break fast forward | |
commit --amend # allowed | |
git rebase --interactive # allowed | |
push --force origin topic/my_feature # allowed | |
Then go on IRC, ask for someone to review and merge to master. If it merges | |
cleanly and nobody has any objections then it can be pushed to master. | |
If it doesn't merge as a fast forward the author of the branch needs to run | |
git remote update | |
git rebase origin/master # or merge | |
and bring the branch up to date so that it can be merged as a fast forward into master. | |
No actual merging (as in a human resolving conflicts) should be done when | |
merging into master, only from master into other branches. | |
=head1 RELEASE WORKFLOW | |
git checkout master | |
# edit for final version bumping, changelogging, etc | |
# prepare release (test suite etc) | |
commit | |
git checkout stable | |
git merge master # must be a fast forward | |
git push both | |
# ship & tag | |
Development releases are made without merging into the stable branch. | |
=head1 EMERGENCY BUG WORKFLOW (for immediate release) | |
Anyone can create the necessary fix by branching off of the stable branch: | |
git remote update | |
git checkout -b topic/my_emergency_fix origin/master | |
hack | |
commit | |
Then a cabal member merges into stable: | |
git checkout stable | |
git merge topic/my_emergency_fix | |
git push | |
# release | |
git checkout master | |
git merge stable | |
=head1 PROJECT WORKFLOW | |
For longer lasting branches we use a subversion style branch layout, where | |
master is routinely merged into the branch. Rebasing is probably not a good | |
idea if there are multiple contributers on such branches. | |
Committing is still done with the same review process as a topic branch, and | |
the branch must merge as a fast forward. | |
This is pretty much the way we're doing branches for largeish things right | |
now. | |
=head1 THE "PU" BRANCH | |
To make things easier for longer lived branches (whether topics or projects), | |
the 'pu' branch is basically what happens if you merge all of the branches and | |
topics together with master. | |
We can update this as necessary (e.g. on a weekly basis if there is merit), | |
notifying the authors of the respective branches if their branches did not merge | |
(and why). | |
To update 'pu': | |
git checkout pu | |
git remote update | |
git reset --hard origin/master | |
git merge @all_the_branches | |
If the merge is clean, 'pu' is updated with push --force. | |
If the merge is not clean, the offending branch is removed from | |
@all_the_branches, with a small note of the conflict, and we try again. | |
The authors of the failed branches should be told to try and merge their branch | |
into 'pu', to see how their branch interacts with other branches. | |
'pu' is probably broken most of the time, but lets us know how the different | |
branches interact. | |
=head1 BRANCH ARCHIVAL | |
Merged branches should be deleted. | |
Failed branches may be kept, but consider moving to refs/attic/ (e.g. | |
http://danns.co.uk/node/295) to keep git branch -l current. | |
Any branch that could still realistically be merged in the future, even if it | |
hasn't had work recently should not be archived. | |
=head1 TESTS, TESTS, TESTS | |
If you write I<any> code for Moose or Class::MOP, you B<must> add | |
tests for that code. If you do not write tests then we cannot | |
guarantee your change will not be removed or altered at a later date, | |
as there is nothing to confirm this is desired behavior. | |
If your code change/addition is deep within the bowels of | |
Moose/Class::MOP and your test exercises this feature in a non-obvious | |
way, please add some comments either near the code in question or in | |
the test so that others know. | |
We also greatly appreciate documentation to go with your changes, and | |
an entry in the Changes file. Make sure to give yourself credit! | |
=head1 BACKWARDS COMPATIBILITY | |
Change is inevitable and Moose is not immune to this. We do our best | |
to maintain backwards compatibility, but we do not want the code base | |
to become overburdened by this. This is not to say that we will be | |
frivolous with our changes, quite the opposite, just that we are not | |
afraid of change and will do our best to keep it as painless as | |
possible for the end user. | |
The rule is that if you do something that is not backwards compatible | |
you B<must> do I<at least> one deprecation cycle (more if it is larger | |
change). For really larger or radical changes dev releases may be | |
needed as well (the core developers will decide on this on a | |
case-per-case basis). | |
The preference with regard to deprecation is to warn loudly and often | |
so that users will have time to fix their usages. | |
All backwards incompatible changes B<must> be documented in | |
L<Moose::Manual::Delta>. Make sure to document any useful tips or | |
workarounds for the change in that document. | |
=head1 AUTHOR | |
Stevan Little E<lt>[email protected]<gt> | |
Chris (perigrin) Prather | |
Yuval (nothingmuch) Kogman | |
=head1 COPYRIGHT AND LICENSE | |
Copyright 2009 by Infinity Interactive, Inc. | |
L<http://www.iinteractive.com> | |
This library is free software; you can redistribute it and/or modify | |
it under the same terms as Perl itself. | |
=cut |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment