You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2022/06/23 11:07:05 UTC
[couchdb] branch backport-from-fdbmain created (now ab00be437)
This is an automated email from the ASF dual-hosted git repository.
ronny pushed a change to branch backport-from-fdbmain
in repository https://gitbox.apache.org/repos/asf/couchdb.git
at ab00be437 Use https as default protocol for links
This branch includes the following new commits:
new 47866dea3 - rename master to main - fixing links
new f164b2dd9 Adding commit message conventions and update links
new ab00be437 Use https as default protocol for links
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb] 03/03: Use https as default protocol for links
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ronny pushed a commit to branch backport-from-fdbmain
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit ab00be43702cfdd74e8a3c24d649aa1b6d06df8a
Author: Ronny <ro...@kioskkinder.com>
AuthorDate: Wed Feb 9 19:59:32 2022 +0100
Use https as default protocol for links
---
README.rst | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/README.rst b/README.rst
index 14e6a2e8b..3fce1072b 100644
--- a/README.rst
+++ b/README.rst
@@ -28,23 +28,23 @@ Documentation
We have documentation:
- http://docs.couchdb.org/
+ https://docs.couchdb.org/
It includes a changelog:
- http://docs.couchdb.org/en/latest/whatsnew/
+ https://docs.couchdb.org/en/latest/whatsnew/
For troubleshooting or cryptic error messages, see:
- http://docs.couchdb.org/en/latest/install/troubleshooting.html
+ https://docs.couchdb.org/en/latest/install/troubleshooting.html
For general help, see:
- http://couchdb.apache.org/#mailing-list
+ https://couchdb.apache.org/#mailing-list
We also have an IRC channel:
- http://webchat.freenode.net/?channels=couchdb
+ https://webchat.freenode.net/?channels=couchdb
The mailing lists provide a wealth of support and knowledge for you to tap into.
Feel free to drop by with your questions or discussion. See the official CouchDB
@@ -91,7 +91,7 @@ currently reside may have restrictions on the import, possession, use, and/or
re-export to another country, of encryption software. BEFORE using any
encryption software, please check your country's laws, regulations and policies
concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted. See <http://www.wassenaar.org/> for more
+to see if this is permitted. See <https://www.wassenaar.org/> for more
information.
The U.S. Government Department of Commerce, Bureau of Industry and Security
[couchdb] 01/03: - rename master to main - fixing links
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ronny pushed a commit to branch backport-from-fdbmain
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 47866dea34c48094a6b9df7813a3495331cb8c31
Author: Ronny <ro...@kioskkinder.com>
AuthorDate: Mon Jan 31 09:39:16 2022 +0100
- rename master to main
- fixing links
---
CONTRIBUTING.md | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cd3a4437c..2ac0c8994 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,8 +20,8 @@ know upfront. We will assess the issue as soon as possible on a best-effort
basis and will give you an estimate for when we have a fix and release available
for an eventual public disclosure.
-The GitHub issue tracker is the preferred channel for [bug reports](#bugs),
-[features requests](#features) and [submitting pull requests](#pull-requests),
+The [GitHub issue tracker][#bugs_and_feature] is the preferred channel for [bug reports](#bug-reports),
+[features requests](#feature-requests) and [submitting pull requests](#pull-requests),
but please respect the following restrictions:
* Please **do not** use the issue tracker for personal support requests. Use
@@ -43,7 +43,7 @@ Guidelines for bug reports:
reported.
2. **Check if the issue has been fixed** — try to reproduce it using the
- latest `master` or `next` branch in the repository.
+ latest `main` or `next` branch in the repository.
3. **Isolate the problem** — ideally create a reduced test case.
@@ -115,8 +115,8 @@ on how to send one :)
2. If you cloned a while ago, get the latest changes from upstream:
```bash
- git checkout master
- git pull upstream master
+ git checkout main
+ git pull upstream main
```
3. Create a new topic branch (off the main project development branch) to
@@ -142,7 +142,7 @@ on how to send one :)
```
8. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
- with a clear title and description.
+ with a clear title and description.
### For Apache CouchDB Committers
@@ -185,11 +185,11 @@ on how to send one :)
Optionally, you can help us with these things. But don’t worry if they are too
complicated, we can help you out and teach you as we go :)
-1. Update your branch to the latest changes in the upstream master branch. You
+1. Update your branch to the latest changes in the upstream main branch. You
can do that locally with
```bash
- git pull --rebase upstream master
+ git pull --rebase upstream main
```
Afterwards force push your changes to your remote feature branch.
@@ -238,7 +238,7 @@ If you have commit access, please follow this process for merging patches and cu
8. If the commit messages follow [our conventions](@commit-message-conventions)
1. If the pull request fixes one or more open issues, please include the
- text "Fixes #472" or "Fixes apache/couchdb#472".
+ text "Fixes #472" or "Fixes apache/couchdb#472".
2. Use the "Rebase and merge" button to merge the pull request.
3. Done! You are awesome! Thanks so much for your help 🤗
@@ -247,7 +247,7 @@ If you have commit access, please follow this process for merging patches and cu
1. Use the "squash and merge" button to clean up the commits and merge at
the same time: ✨🎩
2. If the pull request fixes one or more open issues, please include the
- text "Fixes #472" or "Fixes apache/couchdb#472".
+ text "Fixes #472" or "Fixes apache/couchdb#472".
Sometimes there might be a good reason to merge changes locally. The process
looks like this:
@@ -255,11 +255,11 @@ looks like this:
### Reviewing and merging changes locally
```
-git checkout master # or the main branch configured on github
+git checkout main # or the main branch configured on github
git pull # get latest changes
git checkout feature-branch # replace name with your branch
-git rebase master
-git checkout master
+git rebase main
+git checkout main
git merge feature-branch # replace name with your branch
git push
```
@@ -288,3 +288,4 @@ CONTRIBUTING.md template.
[7]: http://couchdb.apache.org/bylaws.html
[8]: http://couchdb.apache.org/#chat
+[#gh_issues]: https://github.com/apache/couchdb/issues
\ No newline at end of file
[couchdb] 02/03: Adding commit message conventions and update links
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ronny pushed a commit to branch backport-from-fdbmain
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit f164b2dd9983c8c841395946d4178117bc805689
Author: Ronny <ro...@kioskkinder.com>
AuthorDate: Wed Feb 9 13:25:03 2022 +0100
Adding commit message conventions and update links
Added the commit message conventions from the proposal of discussion #3918 and updated all links to use https and moved all external links to the end of the file
---
CONTRIBUTING.md | 111 ++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 76 insertions(+), 35 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2ac0c8994..d575067bc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,18 +11,18 @@ changes, and helping you finalize your pull requests.
Contributions to CouchDB are governed by our [Code of Conduct][6] and a set of
[Project Bylaws][7]. Come join us!
-
## Using the issue tracker
First things first: **Do NOT report security vulnerabilities in public issues!**
-Please disclose responsibly by letting [the Apache CouchDB Security team](mailto:security@couchdb.apache.org?subject=Security)
+Please disclose responsibly by letting [the Apache CouchDB Security team][11]
know upfront. We will assess the issue as soon as possible on a best-effort
basis and will give you an estimate for when we have a fix and release available
for an eventual public disclosure.
-The [GitHub issue tracker][#bugs_and_feature] is the preferred channel for [bug reports](#bug-reports),
-[features requests](#feature-requests) and [submitting pull requests](#pull-requests),
-but please respect the following restrictions:
+The [GitHub issue tracker][#gh_issues] is the preferred channel for
+[bug reports](#bug-reports), [features requests](#feature-requests)
+and [submitting pull requests](#pull-requests), but please respect
+the following restrictions:
* Please **do not** use the issue tracker for personal support requests. Use
[CouchDB Chat][8] instead. Alternately, help us to help more people by
@@ -31,7 +31,6 @@ but please respect the following restrictions:
* Please **do not** derail or troll issues. Keep the discussion on topic and
respect the opinions of others.
-
## Bug reports
A bug is a _demonstrable problem_ that is caused by the code in our
@@ -72,7 +71,6 @@ Example:
> causing the bug, and potential solutions (and your opinions on their
> merits).
-
## Feature requests
Feature requests are welcome. But take a moment to find out whether your idea
@@ -80,7 +78,6 @@ fits with the scope and aims of the project. It's up to *you* to make a strong
case to convince the project's developers of the merits of this feature. Please
provide as much detail and context as possible.
-
## Pull requests
Good pull requests - patches, improvements, new features - are a fantastic
@@ -94,13 +91,46 @@ into the project. You can talk with the community on our
[developer mailing list][5]. We're always open to suggestions and will get
back to you as soon as we can!
+### CouchDB commit message conventions
+
+A well-crafted Git commit message is the best way to communicate context about a
+change to other developers working on that project, and indeed, to your future self.
+
+Commit messages can adequately communicate why a change was made, and understanding
+that makes development and collaboration more efficient.
+
+Here's a great template of a good commit message
+
+```
+Capitalized, short (50 chars or less) summary
+
+More detailed explanatory text, if necessary. Wrap it to about 72
+characters or so. In some contexts, the first line is treated as the
+subject of an email and the rest of the text as the body. The blank
+line separating the summary from the body is critical (unless you omit
+the body entirely); tools like rebase can get confused if you run the
+two together.
+
+Write your commit message in the imperative: "Fix bug" and not "Fixed bug"
+or "Fixes bug." This convention matches up with commit messages generated
+by commands like git merge and git revert.
+
+Further paragraphs come after blank lines.
+
+- Bullet points are okay, too
+
+- Typically a hyphen or asterisk is used for the bullet, followed by a
+ single space, with blank lines in between, but conventions vary here
+
+- Use a hanging indent
+```
### For new Contributors
-If you never created a pull request before, welcome :tada: :smile: [Here is a great tutorial](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)
-on how to send one :)
+If you never created a pull request before, welcome :tada: :smile:
+[Here is a great tutorial][12] on how to send one :)
-1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
+1. [Fork][13] the project, clone your fork,
and configure the remotes:
```bash
@@ -132,7 +162,7 @@ on how to send one :)
the project’s README for more information.
5. If you added or changed a feature, make sure to document it accordingly in
- the [CouchDB documentation](https://github.com/apache/couchdb-documentation)
+ the [CouchDB documentation][14]
repository.
6. Push your topic branch up to your fork:
@@ -141,14 +171,13 @@ on how to send one :)
git push origin <topic-branch-name>
```
-8. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
+8. [Open a Pull Request][15]
with a clear title and description.
-
### For Apache CouchDB Committers
-1. Be sure to set up [GitHub two-factor authentication](https://help.github.com/articles/about-two-factor-authentication/),
- then [link your Apache account to your GitHub account](https://gitbox.apache.org/setup/).
+1. Be sure to set up [GitHub two-factor authentication][16],
+ then [link your Apache account to your GitHub account][17].
You will need to wait about 30 minutes after completing this process
for it to complete. Follow the instructions in the organisational
invite email you receive. Alternately, you can use the Apache mirror
@@ -170,8 +199,7 @@ on how to send one :)
the project’s README for more information.
4. If you added or changed a feature, make sure to document it accordingly in
- the [CouchDB documentation](https://github.com/apache/couchdb-documentation)
- repository.
+ the [CouchDB documentation][14] repository.
5. Push your topic branch up to our repo
@@ -195,12 +223,11 @@ complicated, we can help you out and teach you as we go :)
Afterwards force push your changes to your remote feature branch.
2. Once a pull request is good to go, you can tidy up your commit messages using
- Git's [interactive rebase](https://help.github.com/articles/interactive-rebase).
+ Git's [interactive rebase][18].
**IMPORTANT**: By submitting a patch, you agree to license your work under the
Apache License, per your signed Apache CLA.
-
## Triagers
Apache CouchDB committers who have completed the GitHub account linking
@@ -209,16 +236,15 @@ user and developer pain in working through our backlog.
Briefly, to triage an issue, review the report, validate that it is an actual
issue (reproducing if possible), and add one or more labels. We have a
-[summary of our label taxonomy](https://github.com/apache/couchdb/issues/499)
-for your reference.
+[summary of our label taxonomy][19] for your reference.
If you are not an official committer, please reach out to our [mailing list][5]
or [chat][8] to learn how you can assist with triaging indirectly.
-
## Maintainers
-If you have commit access, please follow this process for merging patches and cutting new releases.
+If you have commit access, please follow this process for merging patches and cutting
+new releases.
### Reviewing changes
@@ -235,7 +261,7 @@ If you have commit access, please follow this process for merging patches and cu
Leave a comment about it so the author and others will know.
7. Once everything looks good, add an "Approve" review. Don’t forget to say
something nice 👏🐶💖✨
-8. If the commit messages follow [our conventions](@commit-message-conventions)
+8. If the commit messages follow [our conventions](#couchdb-commit-message-conventions)
1. If the pull request fixes one or more open issues, please include the
text "Fixes #472" or "Fixes apache/couchdb#472".
@@ -265,7 +291,7 @@ git push
```
When merging PRs from forked repositories, we recommend you install the
-[hub](https://github.com/github/hub) command line tools.
+[hub][#gh_hub] command line tools.
This allows you to do:
@@ -276,16 +302,31 @@ hub checkout link-to-pull-request
meaning that you will automatically check out the branch for the pull request,
without needing any other steps like setting git upstreams! :sparkles:
-
## Thanks
-Special thanks to [Hoodie](https://github.com/hoodiehq/hoodie) for the great
+Special thanks to [Hoodie][#gh_hoodie] for the great
CONTRIBUTING.md template.
-[1]: http://mail-archives.apache.org/mod_mbox/couchdb-user/
-[5]: http://mail-archives.apache.org/mod_mbox/couchdb-dev/
-[6]: http://couchdb.apache.org/conduct.html
-[7]: http://couchdb.apache.org/bylaws.html
-[8]: http://couchdb.apache.org/#chat
-
-[#gh_issues]: https://github.com/apache/couchdb/issues
\ No newline at end of file
+A big thanks to [Robert Painsi][9] and [Bolaji Ayodeji][10] for
+some commit message conventions.
+
+[1]: https://mail-archives.apache.org/mod_mbox/couchdb-user
+[5]: https://mail-archives.apache.org/mod_mbox/couchdb-dev
+[6]: https://couchdb.apache.org/conduct.html
+[7]: https://couchdb.apache.org/bylaws.html
+[8]: https://couchdb.apache.org/#chat
+[9]: https://gist.github.com/robertpainsi/b632364184e70900af4ab688decf6f53
+[10]: https://www.freecodecamp.org/news/writing-good-commit-messages-a-practical-guide
+[11]: mailto:security@couchdb.apache.org?subject=Security
+[12]: https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github
+[13]: https://help.github.com/fork-a-repo
+[14]: https://github.com/apache/couchdb-documentation
+[15]: https://help.github.com/articles/using-pull-requests
+[16]: https://help.github.com/articles/about-two-factor-authentication
+[17]: https://gitbox.apache.org/setup
+[18]: https://help.github.com/articles/interactive-rebase
+[19]: https://github.com/apache/couchdb/issues/499
+
+[#gh_issues]: https://github.com/apache/couchdb/issues
+[#gh_hoodie]: https://github.com/hoodiehq/hoodie
+[#gh_hub]: https://hub.github.com
\ No newline at end of file