curl/docs/CONTRIBUTE.md

281 строка
12 KiB
Markdown
Исходник Обычный вид История

2016-08-09 12:39:58 +03:00
# Contributing to the curl project
2000-05-22 21:35:35 +04:00
2016-08-09 12:39:58 +03:00
This document is intended to offer guidelines on how to best contribute to the
curl project. This concerns new features as well as corrections to existing
flaws or bugs.
## Learning curl
2016-08-09 12:39:58 +03:00
### Join the Community
2000-08-01 02:42:34 +04:00
2016-08-09 12:39:58 +03:00
Skip over to [https://curl.haxx.se/mail/](https://curl.haxx.se/mail/) and join
the appropriate mailing list(s). Read up on details before you post
questions. Read this file before you start sending patches! We prefer
questions sent to and discussions being held on the mailing list(s), not sent
to individuals.
2016-08-09 12:39:58 +03:00
Before posting to one of the curl mailing lists, please read up on the
[mailing list etiquette](https://curl.haxx.se/mail/etiquette.html).
2016-08-09 12:39:58 +03:00
We also hang out on IRC in #curl on irc.freenode.net
2000-05-22 21:35:35 +04:00
2016-08-09 12:39:58 +03:00
If you're at all interested in the code side of things, consider clicking
'watch' on the [curl repo on github](https://github.com/curl/curl) to be
notified of pull requests and new issues posted there.
2001-08-29 19:02:46 +04:00
2016-08-09 12:39:58 +03:00
### License and copyright
2001-08-29 19:02:46 +04:00
2016-08-09 12:39:58 +03:00
When contributing with code, you agree to put your changes and new code under
the same license curl and libcurl is already using unless stated and agreed
otherwise.
2016-08-09 12:39:58 +03:00
If you add a larger piece of code, you can opt to make that file or set of
files to use a different license as long as they don't enforce any changes to
the rest of the package and they make sense. Such "separate parts" can not be
GPL licensed (as we don't want copyleft to affect users of libcurl) but they
must use "GPL compatible" licenses (as we want to allow users to use libcurl
properly in GPL licensed environments).
2000-05-22 21:35:35 +04:00
2016-08-09 12:39:58 +03:00
When changing existing source code, you do not alter the copyright of the
original file(s). The copyright will still be owned by the original creator(s)
or those who have been assigned copyright by the original author(s).
2002-10-08 11:11:34 +04:00
2016-08-09 12:39:58 +03:00
By submitting a patch to the curl project, you are assumed to have the right
to the code and to be allowed by your employer or whatever to hand over that
patch/code to us. We will credit you for your changes as far as possible, to
give credit but also to keep a trace back to who made what changes. Please
always provide us with your full real name when contributing!
2000-05-22 21:35:35 +04:00
2016-08-09 12:39:58 +03:00
### What To Read
2000-05-22 21:35:35 +04:00
2016-08-09 12:39:58 +03:00
Source code, the man pages, the [INTERNALS
document](https://curl.haxx.se/dev/internals.html),
[TODO](https://curl.haxx.se/docs/todo.html),
[KNOWN_BUGS](https://curl.haxx.se/docs/knownbugs.html) and the [most recent
changes](https://curl.haxx.se/dev/sourceactivity.html) in git. Just lurking on
the [curl-library mailing
list](https://curl.haxx.se/mail/list.cgi?list=curl-library) will give you a
lot of insights on what's going on right now. Asking there is a good idea too.
2000-05-22 21:35:35 +04:00
2016-08-09 12:39:58 +03:00
## Write a good patch
2000-05-22 21:35:35 +04:00
2016-08-09 12:39:58 +03:00
### Follow code style
2013-08-06 16:12:45 +04:00
2016-08-09 12:39:58 +03:00
When writing C code, follow the
[CODE_STYLE](https://curl.haxx.se/dev/code-style.html) already established in
the project. Consistent style makes code easier to read and mistakes less
likely to happen. Run `make checksrc` before you submit anything, to make sure
you follow the basic style. That script doesn't verify everything, but if it
complains you know you have work to do.
2016-08-09 12:39:58 +03:00
### Non-clobbering All Over
2016-08-09 12:39:58 +03:00
When you write new functionality or fix bugs, it is important that you don't
fiddle all over the source files and functions. Remember that it is likely
that other people have done changes in the same source files as you have and
possibly even in the same functions. If you bring completely new
functionality, try writing it in a new source file. If you fix bugs, try to
fix one bug at a time and send them as separate patches.
2000-05-22 21:35:35 +04:00
2016-08-09 12:39:58 +03:00
### Write Separate Changes
2000-05-22 21:35:35 +04:00
2016-08-09 12:39:58 +03:00
It is annoying when you get a huge patch from someone that is said to fix 511
odd problems, but discussions and opinions don't agree with 510 of them - or
509 of them were already fixed in a different way. Then the person merging
this change needs to extract the single interesting patch from somewhere
within the huge pile of source, and that creates a lot of extra work.
2002-10-08 11:11:34 +04:00
Preferably, each fix that corrects a problem should be in its own patch/commit
2016-08-09 12:39:58 +03:00
with its own description/commit message stating exactly what they correct so
that all changes can be selectively applied by the maintainer or other
interested parties.
Also, separate changes enable bisecting much better for tracking problems
2016-08-09 12:39:58 +03:00
and regression in the future.
2002-11-28 17:07:14 +03:00
2016-08-09 12:39:58 +03:00
### Patch Against Recent Sources
2013-08-06 16:12:45 +04:00
2016-08-09 12:39:58 +03:00
Please try to get the latest available sources to make your patches against.
It makes the lives of the developers so much easier. The very best is if you
get the most up-to-date sources from the git repository, but the latest
release archive is quite OK as well!
2016-08-09 12:39:58 +03:00
### Documentation
2016-08-09 12:39:58 +03:00
Writing docs is dead boring and one of the big problems with many open source
projects. But someone's gotta do it! It makes things a lot easier if you
submit a small description of your fix or your new features with every
contribution so that it can be swiftly added to the package documentation.
2016-08-09 12:39:58 +03:00
The documentation is always made in man pages (nroff formatted) or plain
ASCII files. All HTML files on the website and in the release archives are
2016-08-09 12:39:58 +03:00
generated from the nroff/ASCII versions.
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
### Test Cases
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
Since the introduction of the test suite, we can quickly verify that the main
features are working as they're supposed to. To maintain this situation and
improve it, all new features and functions that are added need to be tested
in the test suite. Every feature that is added should get at least one valid
test case that verifies that it works as documented. If every submitter also
posts a few test cases, it won't end up as a heavy burden on a single person!
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
If you don't have test cases or perhaps you have done something that is very
hard to write tests for, do explain exactly how you have otherwise tested and
verified your changes.
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
## Sharing Your Changes
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
### How to get your changes into the main sources
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
Ideally you file a [pull request on
github](https://github.com/curl/curl/pulls), but you can also send your plain
patch to [the curl-library mailing
list](https://curl.haxx.se/mail/list.cgi?list=curl-library).
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
Either way, your change will be reviewed and discussed there and you will be
expected to correct flaws pointed out and update accordingly, or the change
risks stalling and eventually just getting deleted without action. As a
submitter of a change, you are the owner of that change until it has been merged.
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
Respond on the list or on github about the change and answer questions and/or
fix nits/flaws. This is very important. We will take lack of replies as a
sign that you're not very anxious to get your patch accepted and we tend to
simply drop such changes.
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
### About pull requests
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
With github it is easy to send a [pull
request](https://github.com/curl/curl/pulls) to the curl project to have
changes merged.
2016-08-09 11:53:42 +03:00
We strongly prefer pull requests to mailed patches, as it makes it a proper
git commit that is easy to merge and they are easy to track and not that easy
to loose in the flood of many emails, like they sometimes do on the mailing
lists.
Every pull request submitted will automatically be tested in several different
ways. Every pull request is verified for each of the following:
- ... it still builds, warning-free, on Linux and macOS, with both
clang and gcc
- ... it still builds fine on Windows with several MSVC versions
- ... it still builds with cmake on Linux, with gcc and clang
- ... it follows rudimentary code style rules
- ... the test suite still runs 100% fine
- ... the release tarball (the "dist") still works
- ... it builds fine in-tree as well as out-of-tree
- ... code coverage doesn't shrink drastically
If the pull-request fails one of these tests, it will show up as a red X and
you are expected to fix the problem. If you don't understand when the issue is
or have other problems to fix the complaint, just ask and other project
members will likely be able to help out.
2016-08-09 11:53:42 +03:00
When you adjust your pull requests after review, consider squashing the
2016-08-09 12:39:58 +03:00
commits so that we can review the full updated version more easily.
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
### Making quality patches
2016-08-09 11:53:42 +03:00
Make the patch against as recent source versions as possible.
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
If you've followed the tips in this document and your patch still hasn't been
incorporated or responded to after some weeks, consider resubmitting it to the
list or better yet: change it to a pull request.
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
### Write good commit messages
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
A short guide to how to write commit messages in the curl project.
2016-08-09 11:53:42 +03:00
2016-08-09 12:39:58 +03:00
---- start ----
[area]: [short line describing the main effect]
-- empty line --
[full description, no wider than 72 columns that describe as much as
possible as to why this change is made, and possibly what things
it fixes and everything else that is related]
-- empty line --
[Closes/Fixes #1234 - if this closes or fixes a github issue]
2016-08-09 12:39:58 +03:00
[Bug: URL to source of the report or more related discussion]
[Reported-by: John Doe - credit the reporter]
[whatever-else-by: credit all helpers, finders, doers]
---- stop ----
2016-08-09 11:53:42 +03:00
The first line is a succinct description of the change:
- use the imperative, present tense: "change" not "changed" nor "changes"
- don't capitalize first letter
- no dot (.) at the end
The `[area]` in the first line can be `http2`, `cookies`, `openssl` or
similar. There's no fixed list to select from but using the same "area" as
other related changes could make sense.
Don't forget to use commit --author="" if you commit someone else's work, and
make sure that you have your own user and email setup correctly in git before
you commit
2010-03-22 02:34:09 +03:00
2016-08-09 12:39:58 +03:00
### Write Access to git Repository
2016-08-09 12:39:58 +03:00
If you are a very frequent contributor, you may be given push access to the
git repository and then you'll be able to push your changes straight into the
git repo instead of sending changes as pull requests or by mail as patches.
2016-08-09 12:39:58 +03:00
Just ask if this is what you'd want. You will be required to have posted
several high quality patches first, before you can be granted push access.
2016-08-09 12:39:58 +03:00
### How To Make a Patch with git
2016-08-09 12:39:58 +03:00
You need to first checkout the repository:
2016-08-09 12:39:58 +03:00
git clone https://github.com/curl/curl.git
2016-08-09 12:39:58 +03:00
You then proceed and edit all the files you like and you commit them to your
local repository:
2016-08-09 12:39:58 +03:00
git commit [file]
As usual, group your commits so that you commit all changes at once that
constitute a logical change.
2010-03-22 02:34:09 +03:00
2016-08-09 12:39:58 +03:00
Once you have done all your commits and you're happy with what you see, you
can make patches out of your changes that are suitable for mailing:
2002-11-28 17:07:14 +03:00
2016-08-09 12:39:58 +03:00
git format-patch remotes/origin/master
2002-11-28 17:07:14 +03:00
2016-08-09 12:39:58 +03:00
This creates files in your local directory named NNNN-[name].patch for each
commit.
2002-11-28 17:07:14 +03:00
2016-08-09 12:39:58 +03:00
Now send those patches off to the curl-library list. You can of course opt to
do that with the 'git send-email' command.
2002-11-28 17:07:14 +03:00
2016-08-09 12:39:58 +03:00
### How To Make a Patch without git
2002-11-28 17:07:14 +03:00
2016-08-09 12:39:58 +03:00
Keep a copy of the unmodified curl sources. Make your changes in a separate
source tree. When you think you have something that you want to offer the
curl community, use GNU diff to generate patches.
2002-11-28 17:07:14 +03:00
2016-08-09 12:39:58 +03:00
If you have modified a single file, try something like:
2003-03-26 14:48:03 +03:00
2016-08-09 12:39:58 +03:00
diff -u unmodified-file.c my-changed-one.c > my-fixes.diff
2003-03-26 14:48:03 +03:00
2016-08-09 12:39:58 +03:00
If you have modified several files, possibly in different directories, you
can use diff recursively:
2003-03-26 14:48:03 +03:00
2016-08-09 12:39:58 +03:00
diff -ur curl-original-dir curl-modified-sources-dir > my-fixes.diff
2003-03-26 14:48:03 +03:00
2016-08-09 12:39:58 +03:00
The GNU diff and GNU patch tools exist for virtually all platforms, including
all kinds of Unixes and Windows:
For unix-like operating systems:
- [https://savannah.gnu.org/projects/patch/](https://savannah.gnu.org/projects/patch/)
- [https://www.gnu.org/software/diffutils/](https://www.gnu.org/software/diffutils/)
For Windows:
- [https://gnuwin32.sourceforge.io/packages/patch.htm](https://gnuwin32.sourceforge.io/packages/patch.htm)
- [https://gnuwin32.sourceforge.io/packages/diffutils.htm](https://gnuwin32.sourceforge.io/packages/diffutils.htm)
### Useful resources
* [Webinar on getting code into cURL](https://www.youtube.com/watch?v=QmZ3W1d6LQI)