Difference between revisions of "Starting as a Contributor"

From D Wiki
Jump to: navigation, search
(Lower importance of some trivial matters)
(feep tells me this is more sane cuz it avoids deleting someone else's data)
 
(79 intermediate revisions by 16 users not shown)
Line 1: Line 1:
 
This page describes how to build D, put together a correct patch, and contribute it as a GitHub pull request.
 
This page describes how to build D, put together a correct patch, and contribute it as a GitHub pull request.
  
== Prerequisites ==
+
==Existing tools==
  
=== POSIX ===
+
If you only want to build the latest and greatest DMD, there exist tools which can do this automatically:
 
 
To build D on POSIX, you will need to have <tt>make</tt>, <tt>g++</tt>, <tt>libcurl4-openssl-dev</tt>, and <tt>git</tt> installed on your system, as well as a working GitHub account. To install the appropriate dependencies on e.g. Ubuntu:
 
 
 
sudo apt-get install git make g++ libcurl4-openssl-dev
 
 
 
To build the 32-bit phobos on a 64-bit machine, <tt>libc6-dev-i386</tt> and <tt>libcurl4-gnutls-dev:i386</tt> are also needed:
 
 
 
sudo apt-get install libc6-dev-i386 libcurl4-gnutls-dev:i386
 
 
 
Other versions and variations of <tt>libcurl</tt> may work as well.
 
 
 
=== Windows ===
 
 
 
On Windows, you will need [https://git-scm.com/ Git for Windows], [http://ftp.digitalmars.com/dmc.zip the DigitalMars C++ compiler], and, for 64-bit or 32-bit COFF builds, the [https://www.microsoft.com/en-us/download/details.aspx?id=8279 Microsoft Windows SDK].
 
 
 
== Building D ==
 
 
 
=== Posix ===
 
 
 
==== Fetch <tt>dmd</tt> from GitHub ====
 
 
 
Let's start by getting the current development (master) branch of dmd from GitHub. Assume the root directory for everything D-related is <tt>~/code</tt> (replace appropriately). This is easily done by running at a command prompt:
 
  
 +
* [https://github.com/dlang/tools/blob/master/setup.sh tools/setup.sh] is a simple script that either installs a new or updates an existing D development tree. Just download the script and run.
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
cd ~/code
+
wget https://raw.githubusercontent.com/dlang/tools/master/setup.sh && bash setup.sh
git clone https://github.com/D-Programming-Language/dmd
+
*** The following projects will be INSTALLED:                                                                                                                                                                   
 +
<YOUR-CURRENT-PATH>/dmd
 +
<YOUR-CURRENT-PATH>/druntime
 +
<YOUR-CURRENT-PATH>/phobos
 +
<YOUR-CURRENT-PATH>/dlang.org
 +
<YOUR-CURRENT-PATH>/tools
 +
<YOUR-CURRENT-PATH>/installer
 +
<YOUR-CURRENT-PATH>/dub
 +
Is this what you want? [y|n]                                                                                                                                                                                   
 +
y                       
 
</syntaxhighlight>
 
</syntaxhighlight>
  
After this step completes successfully, the directory <tt>~/code/dmd</tt> should be up and filled with good stuff.
+
* [https://github.com/CyberShadow/Digger Digger] can download and build D from any point in its recent history.
 
+
* [https://github.com/jacob-carlborg/dvm DVM] can build and locally install D from source code.
==== Bootstrap <tt>dmd</tt> ====
 
 
 
This step is interesting because in order to build <tt>dmd</tt>, <tt>dmd</tt> is necessary. Fortunately, the steps of downloading and using a preexisting <tt>dmd</tt> compiler are automated. All you need to do is run this command:
 
 
 
<syntaxhighlight lang=bash>
 
cd ~/code/dmd
 
make -f posix.mak AUTO_BOOTSTRAP=1
 
</syntaxhighlight>
 
  
That's going to take a while. To make it faster, passing <tt>-j8</tt> accelerates things by running eight processes in parallel. The build produces the compiler binary <tt>~/code/dmd/src/dmd</tt>.
+
There are also the [https://dlang.org/download.html#dmd-nightly dmd-nightly builds].
  
To make <tt>dmd</tt> builds faster in the future, you need to obviate the need for bootstrapping. Install <tt>dmd</tt> from the [http://dlang.org/download.html download page] or simply put the freshly built <tt>dmd</tt> binary in a place accessible through <tt>$PATH</tt> (a popular choice is <tt>~/bin</tt>).
+
== Building from source ==
  
On Windows, you will need
+
The build information is split into Posix and Windows pages. Be sure to follow the instructions in the related guide and come back to this page once your setup is working.
  
==== Fetch and build <tt>druntime</tt> ====
+
* [[Building_under_Posix | Building under Posix (Linux, macOS, FreeBSD, ...)]]
 +
* [[Building_under_Windows | Building under Windows]]
  
<tt>druntime</tt> is the core runtime library for D, needed for building most every D program, including the standard library itself. So it's the next step in the progression (note that it requires a properly built <tt>dmd</tt>, so make sure the above steps have completed successfully). To fetch and build druntime, issue these commands:
+
Once Druntime and Phobos are compiled, you can use your freshly compiled DMD compiler to compile programs:
  
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
cd ~/code
+
~/dlang/dmd/generated/linux/release/64/dmd mytest.d
git clone https://github.com/D-Programming-Language/druntime
 
cd druntime
 
make -f posix.mak
 
 
</syntaxhighlight>
 
</syntaxhighlight>
  
All that should go pretty fast. The somewhat anticlimactic result of the build is a library called <tt>libdruntime.a</tt> situated in an OS-dependent directory such as <tt>~/code/druntime/generated/linux/release/64/</tt>. Make sure it's there.
+
On a different OS, you will need to replace the OS name. For example for <tt>macOS</tt>:
 
 
==== Fetch and build <tt>phobos</tt> ====
 
 
 
Most D programs use D's standard library <tt>phobos</tt>. To get and build it, make sure you first fetch and build the latest <tt>dmd</tt> and <tt>druntime</tt>. Then:
 
  
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
cd ~/code
+
~/dlang/dmd/generated/osx/release/64/dmd mytest.d
git clone https://github.com/D-Programming-Language/phobos
 
cd phobos
 
make -f posix.mak
 
 
</syntaxhighlight>
 
</syntaxhighlight>
  
The build produces (with similar anticlimacticity) static and shared libraries such as <tt>~/code/phobos/generated/linux/release/64/libphobos2.a</tt> and <tt>~/code/phobos/generated/linux/release/64/libphobos2.so</tt>.
+
== Development ==
 
 
=== Windows ===
 
  
The following instructions work for win32. May or may not work with win64. This scheme is a suggestion. These instructions should work when building from a clean repository, however, this repository contains autogenerated code that may be left behind after switching branches so running a git clean after switching branches is a good idea:
+
Depending on which part of the D ecosystem you want to dive in, there are separate guides which explain e.g. how unittests are run:
  
<syntaxhighlight lang=dos>
+
* [[DMD_development | DMD Development]], [https://github.com/dlang/dmd/blob/master/CONTRIBUTING.md DMD Contribution Guide], and [[DMD_Source_Guide | DMD Source Guide]]
git clean -xfd
+
* [[DRuntime_development | DRuntime development]]
</syntaxhighlight>
+
* [[Contributing_to_Phobos | Phobos development]]
 +
* [[Contributing_to_dlang.org | Dlang.org development]] (D documentation)
  
Assuming your sources are checked out {{code|C:\D}}, and that {{code|make}} from digital mars is in your path, you can do the following to build them:
+
There is also <tt>[https://github.com/dlang/tools tools]</tt> (typically cloned to the <tt>~/dlang/tools</tt> folder) where small helper programs live.
 +
For a full description of the tools provided, please see <tt>[https://github.com/dlang/tools tools]</tt>.
 +
If you are on Windows, {{code|dtab}} (transforms tabs into spaces in source code) and {{code|tolf}} (replaces line endings with LF) might prove helpful.
  
<syntaxhighlight lang=dos>
+
Additionally, there are other repositories which are parts of the D ecosystem: <tt>[https://github.com/dlang/dconf.org dconf.org]</tt>, <tt>[https://github.com/dlang/dub dub]</tt>, <tt>[https://github.com/dlang/dub-registry dub-registry]</tt>, <tt>[https://github.com/dlang/installer installer]</tt>, <tt>[https://github.com/dlang/tools tools]</tt>, <tt>[https://github.com/dlang/visuald visuald]</tt>, <tt>[https://github.com/dlang/ci ci]</tt>, <tt>[https://github.com/dlang/undeaD undeaD]</tt> and more.
set DM_HOME=C:\D
 
cd %DM_HOME%\dmd2\src\dmd\src
 
make -fwin32.mak release
 
</syntaxhighlight>
 
  
From there, it is suggested to move the built binaries into your {{code|%DM_HOME%\windows\bin}} directory, and add that to your path:
+
These ancillary repositories are of somewhat specific interest. Their installation process mimics that of the repositories described above. If you get to the point where you need to work on one of these, chances are you're already versed in what needs doing. If not, [http://forum.dlang.org/group/digitalmars.D ask away].
<syntaxhighlight lang=dos>
 
copy *.exe %DM_HOME%\dmd2\windows\bin
 
set path=%path%;%DM_HOME%\dmd2\windows\bin
 
</syntaxhighlight>
 
  
From there, you have to create a {{code|sc.ini}} in your {{code|DMD.exe}} directory. It is suggested to just copy paste the one provided in the packaged {{Latest DMD Version Raw}}, instead of writing your own.
+
== Typical Contributor Workflow ==
  
Now build druntime:
+
There are many ways to use <tt>git</tt> and GitHub to contribute. Here's a typical one.
<syntaxhighlight lang=dos>
 
cd %DM_HOME%\dmd2\src\druntime
 
make -fwin32.mak
 
</syntaxhighlight>
 
 
 
And phobos:
 
<syntaxhighlight lang=dos>
 
cd %DM_HOME%\dmd2\src\phobos
 
make -fwin32.mak
 
</syntaxhighlight>
 
 
 
You should copy the phobos lib into your {{code|windows\lib}} folder:
 
<syntaxhighlight lang=dos>
 
copy phobos.lib %DM_HOME%\dmd2\windows\lib
 
</syntaxhighlight>
 
 
 
Optionally, you can build rdmd from source if you have checked out {{code|tools}} in your sources:
 
<syntaxhighlight lang=dos>
 
cd %DM_HOME%\dmd2\src\tools
 
make -fwin32.mak rdmd.exe
 
copy *.exe %DM_HOME%\dmd2\windows\bin
 
</syntaxhighlight>
 
  
The last step is getting the additional libs. curl for D2 can be found at the bottom of the download section of dlang.org: [[http://dlang.org/download.html download]].
+
First, fork the github repository or repositories you'd like to contribute to (<tt>dmd</tt>, <tt>druntime</tt>, <tt>phobos</tt> etc) by navigating to their respective pages on <tt>github.com</tt> and clicking "Fork" (e.g. [https://github.com/dlang/dmd dmd], [https://github.com/dlang/druntime druntime], and [https://github.com/dlang/phobos phobos]). Then, set up your local git repository to reflect that. For example, consider you want to contribute to <tt>phobos</tt> and have forked it. Then run these commands:
 
 
Additional libs that are necessary can simply be copy pasted from the {{Latest DMD Version Raw}} package (without overwriting your {{code|phobos.lib}})
 
 
 
The very last step is to verify that everything works by unittesting phobos:
 
 
 
<syntaxhighlight lang=dos>
 
cd %DM_HOME%\dmd2\src\phobos
 
make -fwin32.mak unittest
 
</syntaxhighlight>
 
 
 
==== Common Windows issues ====
 
 
 
===== Missing MASM386=====
 
 
 
If when building druntime you get errors about missing MASM386, it's due to a required assembling of a file called '''minit.asm'''. However the druntime repository includes a prebuilt minit.obj file so you shouldn't need to assemble it again. As a workaround for the make error create an empty '''masm386.bat''' file and put it in a directory that's in your '''PATH'''.
 
 
 
It's also recommended that you use the cmd.exe terminal. Others, like PowerShell, are known to experience issues with legacy tools.
 
 
 
===== Intermediate files lead to several errors =====
 
 
 
The three main components (dmd, druntime, phobos) should always be built together with matching versions. The intermediate files generated by a previous build can lead to a failure so it's advisable to run
 
 
 
<syntaxhighlight lang=dos>
 
make -fwin32.mak clean
 
</syntaxhighlight>
 
 
 
on each component before starting the process.
 
 
 
== Unittest <tt>phobos</tt> ==
 
 
 
If you want to work on phobos itself, you need to run unittests&mdash;either for the full library, a package, or a module. To unittest the entire library:
 
  
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
make -j16 -f posix.mak unittest
+
cd ~/dlang/phobos
 +
git remote set-url origin git@github.com:USERNAME/phobos.git
 
</syntaxhighlight>
 
</syntaxhighlight>
  
Adjust the parameter passed to <tt>-j</tt> depending on your machine (beefier machines support larger parameters). This command unittests <tt>phobos</tt> in both debug and release mode. To only test one of them, add <tt>BUILD=debug</tt> or <tt>BUILD=release</tt> to the command line, for example:
+
(Replace <tt>USERNAME</tt> with your actual github user name.)
  
<syntaxhighlight lang=bash>
+
This sets your forked repository as origin.
make -j16 -f posix.mak BUILD=debug unittest
+
If you <b>don't have</b> the phobos repository, go back to the [[#Building from source|Building from source section]] or make a fresh clone from your fork:
</syntaxhighlight>
 
 
 
Specifying <tt>BUILD</tt> makes unittesting faster so it is recommended in iterative development. Just make sure both debug and release builds are tested before e.g. submitting a pull request.
 
 
 
While changing one specific package or module, it's useful to be able to only unittest that particular entity. The following two commands only unittest (in debug mode) the <tt>std.algorithm</tt> package and the <tt>std.conv</tt> module, respectively:
 
  
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
make -j16 -f posix.mak BUILD=debug std/algorithm.test
+
cd ~/dlang
make -j16 -f posix.mak BUILD=debug std/conv.test
+
git clone git@github.com:username/phobos.git
 
</syntaxhighlight>
 
</syntaxhighlight>
  
Several modules, packages, or mix thereof may be specified for testing in the same command line. For example, this command also tests (and also in debug mode) the <tt>std.algorithm</tt> package and the <tt>std.conv</tt> module, with better parallelism:
+
Now within your Phobos repository, setup the official Phobos repository as upstream remote node:
  
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
make -j16 -f posix.mak BUILD=debug std/algorithm.test std/conv.test
+
cd ~/dlang/phobos
 +
git remote add upstream https://github.com/dlang/phobos.git
 +
git fetch && git fetch upstream
 
</syntaxhighlight>
 
</syntaxhighlight>
  
The auto-tester will fail your PR if your changes contain trailing whitespace or incorrect line endings. You can run this test locally with the command:
+
Then, it's best to work in branches as shown below:
  
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
make -j16 -f posix.mak checkwhitespace
+
git checkout -b awesome-new-feature
 +
# ... get some good work done here ...
 +
git commit -am "Awesome new feature ..."
 +
git push myfork
 
</syntaxhighlight>
 
</syntaxhighlight>
  
== Fetch and build <tt>dlang.org</tt> ==
+
With this, your work is in your github fork of the <tt>phobos</tt> (or whichever) repository. After that, visit your fork on <tt>github.com</tt>, which looks like <tt>https://github.com/username/phobos/tree/awesome-new-feature</tt>.
 
+
Also, you can always pull-in the latest, greatest Phobos changes:
This step is optional. Significant changes to <tt>phobos</tt>' documentation require that the site (which includes automatically generated <tt>phobos</tt> documentation) builds successfully. The following will build all documentation in all forms (see the note below about building just the html documentation):
 
  
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
cd ~/code
+
git checkout master
git clone https://github.com/D-Programming-Language/dlang.org
+
git fetch && git fetch upstream && git merge --ff-only upstream/master
cd dlang.org
 
make -f posix.mak
 
 
</syntaxhighlight>
 
</syntaxhighlight>
  
All of <tt>dmd</tt>, <tt>druntime</tt>, and <tt>phobos</tt> are needed for the site to build. Note that one of the first lines output during the <tt>make</tt> run looks like this:
+
== Create a pull request ==
  
<syntaxhighlight lang=bash>
+
Once you have tested all your changes and pushed them to your fork on GitHub, you are ready to submit a pull request.
LATEST={{Latest DMD Version Raw}} # <-- place in the command line to skip network traffic.
+
Navigate to <tt>[https://github.com/dlang/phobos phobos]</tt> GitHub page and you should already see your branch:
</syntaxhighlight>
 
  
That's advice worth heeding because fetching <tt>LATEST</tt> automatically involves network traffic, which adds time to the build. So for future builds use this:
+
[[File:Phobos_start_new_PR.png|800px]]
  
<syntaxhighlight lang=bash>
+
Alternatively you can also click on the "New pull request" button, select "Compare across forks", select your repository as "head fork" and select the branch that you made your changes in, say issue_1234.
make -f posix.mak LATEST={{Latest DMD Version Raw}}
 
</syntaxhighlight>
 
  
Of course, parallelizing with <tt>-j</tt> improves speed as well.
+
[[File:PR_compare_across_changes.png|800px]]
  
The build produces the entire site at <tt>~/code/dlang.org/web</tt>. To informally test it, open the appropriate HTML documents in that directory. Note that the currently released phobos has documentation in <tt>~/code/dlang.org/web/phobos</tt>, whereas the current (fresh) build of phobos has documentation in  <tt>~/code/dlang.org/web/phobos-prerelease</tt>. So, for example, if you change the embedded documentation in <tt>~/code/phobos/std/conv.d</tt>, the changes are visible in  <tt>~/code/dlang.org/web/phobos-prerelease/std_conv.html</tt>. (The build process replaces the slashes in submodules with underscores.)
+
This will submit your changes for review by the D maintainers. If your changes are approved, they will be merged into the master branch. Otherwise, if the maintainers have some comments or feedback, you can refine your changes by editing and testing in your local workspace, and pushing the new changes to the same git branch. The new changes will be automatically included in your pull request.
  
Note that the above steps will build all of the documentation in all forms, including Kindle builds and various other things that may require installing additional tools, and may download/build old versions of DMD. To prevent that, you can add the '''html''' option:
+
=== How to choose a title for your Pull Request ===
  
<syntaxhighlight lang=bash>
+
Choose a title for your pull request that clearly states what it does. When fixing a bug, the usual thing to do is to use the title from the bugzilla report.  Eg a title like "Fix 3797" or "Issue 3797" contains much less information than "Fix Issue 3797 - Regression(2.038): Implicit conversion between incompatible function pointers" and requires a lot more effort for the reviewers to determine if it is something they are interested in.
make -f posix.mak LATEST={{Latest DMD Version Raw}} html
 
</syntaxhighlight>
 
 
 
Alternatively to building the documentation locally, you can use the documentation autotester service, which will build documentation, generate a diff of the results, and add a link to your GitHub pull request.
 
 
 
=== Ancillary stuff ===
 
  
<tt>[https://github.com/D-Programming-Language/dconf.org dconf.org]</tt>, <tt>[https://github.com/D-Programming-Language/dub dub]</tt>, <tt>[https://github.com/D-Programming-Language/dub-registry dub-registry]</tt>, <tt>[https://github.com/D-Programming-Language/installer installer]</tt>, <tt>[https://github.com/D-Programming-Language/tools tools]</tt>, and <tt>[https://github.com/D-Programming-Language/visuald visuald]</tt> ===
+
If a pull request isn't a trivial bug, its description should explain the motivation for the change and briefly summarize the changes.
  
These ancillary repositories are of somewhat specific interest. Their installation mimics that of the repositories described above. If you get to the point where you need to work on one of these, chances are you're already versed in what needs doing. If not, [http://forum.dlang.org/group/digitalmars.D ask away].
+
=== Submitting a bug fix ===
  
== Typical Contributor Workflow ==
+
If the pull request is for a bug fix, the commit message should have the format "fix issue 1234". This allow the [https://github.com/dlang-bots/dlang-bot Dlang-Bot] to automatically pick up the issue from [[Bugzilla]] and post it as a comment on the PR.
 +
It's important the bot can link your commit message to the respective Bugzilla issue as it will then automatically close the issue on Bugzilla and otherwise the fixed issue won't appear in the changelog.
  
There are many ways to use <tt>git</tt> and GitHub to contribute. Here's a typical one.
+
If the PR is already open, then a <tt>git rebase</tt> is necessary followed by a force push. During the rebase, the commit message should be renamed to match the "Fix <copy bugzilla title>"
  
First, fork the github repository or repositories you'd like to contribute to (<tt>dmd</tt>, <tt>druntime</tt>, <tt>phobos</tt> etc) by navigating to their respective pages on <tt>github.com</tt> and clicking "Fork". Then, set up your local git repository to reflect that. For example, consider you want to contribute to <tt>phobos</tt> and have forked it. Then run these commands:
+
[[File:Bugzilla_issue_title.png]]
  
<syntaxhighlight lang=bash>
+
For [https://issues.dlang.org/show_bug.cgi?id=9582 Issue 9582], the commit message could be <tt>Fix Issue 9582 - std.algorithm.map!(T) cause CT error for fixed size arrays</tt>.
cd ~/code/phobos
 
git remote add myfork https://github.com/username/phobos.git
 
git remote update
 
</syntaxhighlight>
 
  
(Replace <tt>username</tt> with your actual github user name.) This adds the "myfork" repository and makes sure everything is synchronized between your local copy and the remote repositories. Then, it's best to work in branches as shown below:
+
After the pull request is created, don't forget to add a link to your pull request posted to the corresponding Bugzilla issue in a comment, so that future contributor are aware of your work and don't redo the fix.
 +
Hence, it's also helpful to add the 'pull' keyword to the Bugzilla issue.
  
<syntaxhighlight lang=bash>
+
=== Characteristics of a good pull request ===
git checkout -b awesome-new-feature
 
# ... get some good work done here ...
 
git commit -am "Awesome new feature ..."
 
git push -f myfork
 
</syntaxhighlight>
 
  
With this, your work is in your github fork of the <tt>phobos</tt> (or whichever) repository. After that, visit your fork on <tt>github.com</tt>, which looks like <tt>https://github.com/username/phobos/tree/awesome-new-feature</tt>.
+
* Addresses one topic only.
 +
* Refactorings should not be mixed in with bug fixes or enhancements.
 +
* Refactorings should be marked as such in the subject, and must not contain any behavior changes.
 +
* Larger refactorings need to broken up into smaller PRs.
  
== Create a pull request ==
+
The problems with large PRs are:
  
Once you have tested all your changes and pushed them to your fork on GitHub, you are ready to submit a pull request.
+
* They are hard to review.
 +
* github is very slow at serving pages with large diffs on them.
 +
* If the PR introduces a regression, a large diff is much harder to debug than a small one.
 +
* They imply an all or nothing view of it, when it actually may have good parts and bad parts.
  
* Navigate to your fork of the project on GitHub.
+
== Working on an pull request ==
* '''Important''': Select the branch that you made your changes in, say issue_1234.
 
* Click on the "Pull Request" button.
 
 
 
This will submit your changes for review by the D maintainers. If your changes are approved, they will be merged into the master branch. Otherwise, if the maintainers have some comments or feedback, you can refine your changes by editing and testing in your local workspace, and pushing the new changes to the same git branch. The new changes will be automatically included in your pull request.
 
 
 
Choose a title for your pull request that clearly states what it does.  When fixing a bug, the usual thing to do is to use the summary from the bugzilla report.  Eg a title like "Fix 3797" or "Issue 3797" contains much less information than "Fix Issue 3797 - Regression(2.038): Implicit conversion between incompatible function pointers" and requires a lot more effort for the reviewers to determine if it is something they are interested in.
 
 
 
Pull request descriptions should contain a hyperlink to the [[Bugzilla]] issue that is being fixed.  This is usually added at the end of the description.
 
 
 
After the pull request is created, add the 'pull' keyword to the corresponding Bugzilla issue and a link to the pull request posted in a comment.
 
  
 
=== Autotester ===
 
=== Autotester ===
Line 275: Line 164:
 
=== Rebasing ===
 
=== Rebasing ===
  
Sometimes, if a particular change you are working on is taking a long time, or if you encounter a problem that is fixed by a new commit upstream, you may need to sync your local branch with master in order to keep the code up-to-date. In this case, it is recommended that you use git rebase to apply your changes ''on top of'' the latest git master, so that when you submit a pull request, the change history will be easier for the reviewers to follow. Using git merge is ''not'' recommended, as it may produce a lot of merge commits that may not be relevant to your changes.
+
Sometimes, if a particular change you are working on is taking a long time, or if you encounter a problem that is fixed by a new commit upstream, you may need to sync your local branch with master in order to keep the code up-to-date. In this case, it is recommended that you use git rebase to apply your changes ''on top of'' the latest git master, so that when you submit a pull request, the change history will be easier for the reviewers to follow. git merge should <b>not</b> be used, as it may produce a lot of merge commits that may not be relevant to your changes.
  
 
For example, you may be working on your changes:
 
For example, you may be working on your changes:
  
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
cd /usr/src/d/phobos
+
cd ~/dlang/phobos
 
git checkout mybranch
 
git checkout mybranch
 
vim std/algorithm.d  # apply lots of cool changes here
 
vim std/algorithm.d  # apply lots of cool changes here
Line 288: Line 177:
  
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
git commit -a
+
git commit --ammend
 
</syntaxhighlight>
 
</syntaxhighlight>
  
Line 294: Line 183:
  
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
git remote add upstream git@github.com:D-Programming-Language/phobos
+
git remote add upstream git@github.com:dlang/phobos
 
</syntaxhighlight>
 
</syntaxhighlight>
 
   
 
   
Line 304: Line 193:
 
</syntaxhighlight>
 
</syntaxhighlight>
  
The --ff-only option is to ensure that your master branch is identical to the official D sources' master branch, since otherwise you will end up with a very messy history that will be hard to clean up (and the reviewers will probably reject your pull request due to having unrelated merge commits).
+
The <tt>--ff-only</tt> option is to ensure that your master branch is identical to the official D sources' master branch, since otherwise you will end up with a very messy history that will be hard to clean up (and the reviewers will probably reject your pull request due to having unrelated merge commits).
  
 
Now go back to your branch and rebase it:
 
Now go back to your branch and rebase it:
Line 315: Line 204:
 
Now your sources should be up-to-date. Recompile and test everything to make sure it all works.
 
Now your sources should be up-to-date. Recompile and test everything to make sure it all works.
  
Note that after rebasing, you will need to force an update to your fork on GitHub with the -f flag, otherwise it will fail because the histories don't match anymore:
+
Note that after rebasing, you will need to force an update to your fork on GitHub with the --force-with-lease flag, otherwise it will fail because the histories don't match anymore:
  
 
<syntaxhighlight lang=bash>
 
<syntaxhighlight lang=bash>
git push -f origin mybranch
+
git push --force-with-lease origin mybranch
 
</syntaxhighlight>
 
</syntaxhighlight>
  
Line 324: Line 213:
  
 
If, during the 'git rebase' command, you encounter conflicts, you may want to learn [http://stackoverflow.com/questions/8780257/git-rebase-a-branch-onto-master-failed-how-to-resolve how to resolve a conflict during git rebase].
 
If, during the 'git rebase' command, you encounter conflicts, you may want to learn [http://stackoverflow.com/questions/8780257/git-rebase-a-branch-onto-master-failed-how-to-resolve how to resolve a conflict during git rebase].
 +
 +
=== Squashing ===
 +
 +
After receiving feedback on your PR, it's common for it to have lots of commits that don't add much by being separate. For example, consider the following git history on a PR:
 +
 +
commit [ffffff] Added new function: foobar
 +
commit [aaaaaa] Spelling error fix in foobar docs
 +
commit [cccccc] Clarified Docs for foobar
 +
 +
Nothing is gained from having these as three separate commits as they are all focused on one feature. Instead, they should be one commit so the history looks like this
 +
 +
commit [333333] Added new function: foobar
 +
 +
while still retaining all of your changes. In order to perform this, please consult this [https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits guide]
 +
 +
You can also directly append to your last commit and force an update of your PR:
 +
 +
<syntaxhighlight lang=bash>
 +
git commit --amend
 +
git push --force-with-lease
 +
</syntaxhighlight>
  
 
=== Stable Branch ===
 
=== Stable Branch ===
Line 340: Line 250:
 
Then follow the instructions for [[#Make your changes in a branch|making a branch]].
 
Then follow the instructions for [[#Make your changes in a branch|making a branch]].
  
If you forget to do this, or didn't realize it, It's not possible to simply re-target your branch for pulling into the stable branch. GitHub will let you do this, but your branch will include many of the changes from the unstable branch!
+
Unfortunately, it's not possible to simply re-target your branch for pulling into the stable branch. GitHub will let you do this, but your branch will include many of the changes from the unstable branch!
  
 
In order to fix such a problem, you can [[#Rebasing|rebase]] your changes from master on top of the stable branch. First you need to pull in the stable branch from your fork on github:
 
In order to fix such a problem, you can [[#Rebasing|rebase]] your changes from master on top of the stable branch. First you need to pull in the stable branch from your fork on github:
Line 358: Line 268:
 
You may have to follow the instructions in the [[#Rebasing|Rebasing section]] on adding the upstream branch, substituting stable for master, if you need to update to the latest stable changes.
 
You may have to follow the instructions in the [[#Rebasing|Rebasing section]] on adding the upstream branch, substituting stable for master, if you need to update to the latest stable changes.
  
This sometimes may not work, as the changes between the stable and master are too drastic. In this case, you may have to re create your changes after a clean checkout of the stable branch.
+
This sometimes may not work, as the changes between the stable and master are too drastic. In this case, you may have to re-create your changes after a clean checkout of the stable branch.
  
 
When creating a pull request, you need to tell github to target the stable branch instead of master on the upstream repository. This is done via a drop-down at the top of the page, make sure to do this before submitting your pull request as this cannot be changed after the PR is created (you will have to close the PR and create a new one).
 
When creating a pull request, you need to tell github to target the stable branch instead of master on the upstream repository. This is done via a drop-down at the top of the page, make sure to do this before submitting your pull request as this cannot be changed after the PR is created (you will have to close the PR and create a new one).
Line 374: Line 284:
 
Please note that any updates pushed to the candidate branch do not automatically notify a subscribed person. If you update your branch to correct an issue, please also put in a comment indicating it.
 
Please note that any updates pushed to the candidate branch do not automatically notify a subscribed person. If you update your branch to correct an issue, please also put in a comment indicating it.
  
== Copyright assignment ==
+
== Contributing FAQ ==
 +
 
 +
=== A file that I made a change on was modified by a different merged PR, and now my PR can't be merged, now what? ===
 +
 
 +
What you need to do is rebase your git branch on the master branch. What this does is rewrite the history of your git branch to make it seem like it was merged off of the head of master rather than the older commit where you actually branched. This will include the new commits in your PR so your PR no longer conflicts. See [https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request this tutorial] for more details.
 +
 
 +
=== I would like to help but I don't know how. What is the best way? ===
 +
 
 +
Anyone is welcome to contribute as D is very much a volunteer effort!
 +
The best place to look for ideas to contribute is the [[Get involved|get involved]] guide.
 +
Please also don't hesitate to point out (or even fix) any stumbling blocks you may encounter when starting out.
 +
 
 +
=== CodeCov shows a red cross ===
 +
 
 +
[[File:CI_CodeCov_failed.png]]
  
Please note that all contributions to DMD backend source code require that the copyright to that code be assigned to Digital Mars. This does not apply to the DMD frontend, Druntime, Phobos, or the official tools.
+
On every build the generated coverage files are sent to CodeCov for further processing.
 +
You can see the non-covered lines by clicking on the link or for further convenience in the future by installing the [https://github.com/codecov/browser-extension CodeCov browser extension].
  
== Contributing FAQ ==
+
=== CircleCi shows a red cross ===
 +
 
 +
[[File:CI_CircleCI_failed.png]]
 +
 
 +
On CircleCi static code analysis is run. For example it lints the Phobos codebase after [https://dlang.org/dstyle.html the DStyle].
 +
Moreover, checks are run to ensure that every example on dlang.org is runnable. On Posix, you can run this locally by executing the <tt>style</tt> target:
 +
 
 +
<syntaxhighlight lang=bash>
 +
make -f posix.mak style
 +
</syntaxhighlight>
 +
 
 +
=== The auto-tester shows a red cross ===
 +
 
 +
[[File:CI_auto-tester_failed.png]]
  
=== Someone asked me to squash my commits, what does that mean? ===
+
The [https://auto-tester.puremagic.com auto-tester] tests every PR on all supported platforms (Windows, Linux, macOS, and Linux) for 32 and 64-bit builds.
 +
Please click on the link of your PR to find out more about the error.
  
After receiving feedback on your PR, it's common for it to have lots of commits that don't add much by being separate. For example, consider the following git history on a PR:
+
=== The Jenkins Project Tester shows a red cross ===
  
commit [ffffff] Added new function: foobar
+
[[File:CI_project_tester.png]]
commit [aaaaaa] Spelling error fix in foobar docs
 
commit [cccccc] Clarified Docs for foobar
 
  
Nothing is gained from having these as three separate commits as they are all focused on one feature. Instead, they should be one commit so the history looks like this
+
The Project Tester tests every PR on all supported platforms (Windows, Linux, macOS, and Linux) for 32 and 64-bit builds.
 +
Please click on the link of your PR to find out more about the error.
  
commit [333333] Added new function: foobar
+
=== How can I link a PR with Bugzilla? ===
  
while still retaining all of your changes. In order to perform this, please consult [http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html this tutorial].
+
[[File:DLang_Bot_comment.png]]
  
 +
The integration is handled by [https://github.com/dlang-bots/dlang-bot Dlang-Bot].
 +
If you mention a bugzilla issue in your git commit message, you will get linked to the Bugzilla issue.
 +
For more information, please visit [https://github.com/dlang-bots/dlang-bot Dlang-Bot's documentation].
  
=== A file that I made a change on was modified by a different merged PR, and now my PR can't be merged, now what? ===
+
== See Also ==
  
What you need to do is rebase your git branch on the master branch. What this does is rewrite the history of your git branch to make it seem like it was merged off of the head of master rather than the older commit where you actually branched. This will include the new commits in your PR so your PR no longer conflicts. See [https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request this tutorial] for more details.
+
* [https://github.com/dlang/dmd/blob/master/CONTRIBUTING.md Contributing to DMD]
 +
* [[DMD Source Guide]]
 +
* [[Contributing_to_Phobos| Contributing to Phobos]]
 +
* [[Contributing_to_dlang.org| Contributing to dlang.org]]
 +
* [[Guidelines for maintainers]]
 +
* [[Get involved]]
  
 
[[Category: Contribution Guidelines]]
 
[[Category: Contribution Guidelines]]

Latest revision as of 18:28, 11 December 2019

This page describes how to build D, put together a correct patch, and contribute it as a GitHub pull request.

Existing tools

If you only want to build the latest and greatest DMD, there exist tools which can do this automatically:

  • tools/setup.sh is a simple script that either installs a new or updates an existing D development tree. Just download the script and run.
wget https://raw.githubusercontent.com/dlang/tools/master/setup.sh && bash setup.sh
*** The following projects will be INSTALLED:                                                                                                                                                                    
<YOUR-CURRENT-PATH>/dmd
<YOUR-CURRENT-PATH>/druntime
<YOUR-CURRENT-PATH>/phobos
<YOUR-CURRENT-PATH>/dlang.org
<YOUR-CURRENT-PATH>/tools
<YOUR-CURRENT-PATH>/installer
<YOUR-CURRENT-PATH>/dub
Is this what you want? [y|n]                                                                                                                                                                                     
y
  • Digger can download and build D from any point in its recent history.
  • DVM can build and locally install D from source code.

There are also the dmd-nightly builds.

Building from source

The build information is split into Posix and Windows pages. Be sure to follow the instructions in the related guide and come back to this page once your setup is working.

Once Druntime and Phobos are compiled, you can use your freshly compiled DMD compiler to compile programs:

~/dlang/dmd/generated/linux/release/64/dmd mytest.d

On a different OS, you will need to replace the OS name. For example for macOS:

~/dlang/dmd/generated/osx/release/64/dmd mytest.d

Development

Depending on which part of the D ecosystem you want to dive in, there are separate guides which explain e.g. how unittests are run:

There is also tools (typically cloned to the ~/dlang/tools folder) where small helper programs live. For a full description of the tools provided, please see tools. If you are on Windows, dtab (transforms tabs into spaces in source code) and tolf (replaces line endings with LF) might prove helpful.

Additionally, there are other repositories which are parts of the D ecosystem: dconf.org, dub, dub-registry, installer, tools, visuald, ci, undeaD and more.

These ancillary repositories are of somewhat specific interest. Their installation process mimics that of the repositories described above. If you get to the point where you need to work on one of these, chances are you're already versed in what needs doing. If not, ask away.

Typical Contributor Workflow

There are many ways to use git and GitHub to contribute. Here's a typical one.

First, fork the github repository or repositories you'd like to contribute to (dmd, druntime, phobos etc) by navigating to their respective pages on github.com and clicking "Fork" (e.g. dmd, druntime, and phobos). Then, set up your local git repository to reflect that. For example, consider you want to contribute to phobos and have forked it. Then run these commands:

cd ~/dlang/phobos
git remote set-url origin git@github.com:USERNAME/phobos.git

(Replace USERNAME with your actual github user name.)

This sets your forked repository as origin. If you don't have the phobos repository, go back to the Building from source section or make a fresh clone from your fork:

cd ~/dlang
git clone git@github.com:username/phobos.git

Now within your Phobos repository, setup the official Phobos repository as upstream remote node:

cd ~/dlang/phobos
git remote add upstream https://github.com/dlang/phobos.git
git fetch && git fetch upstream

Then, it's best to work in branches as shown below:

git checkout -b awesome-new-feature
# ... get some good work done here ...
git commit -am "Awesome new feature ..."
git push myfork

With this, your work is in your github fork of the phobos (or whichever) repository. After that, visit your fork on github.com, which looks like https://github.com/username/phobos/tree/awesome-new-feature. Also, you can always pull-in the latest, greatest Phobos changes:

git checkout master
git fetch && git fetch upstream && git merge --ff-only upstream/master

Create a pull request

Once you have tested all your changes and pushed them to your fork on GitHub, you are ready to submit a pull request. Navigate to phobos GitHub page and you should already see your branch:

Phobos start new PR.png

Alternatively you can also click on the "New pull request" button, select "Compare across forks", select your repository as "head fork" and select the branch that you made your changes in, say issue_1234.

PR compare across changes.png

This will submit your changes for review by the D maintainers. If your changes are approved, they will be merged into the master branch. Otherwise, if the maintainers have some comments or feedback, you can refine your changes by editing and testing in your local workspace, and pushing the new changes to the same git branch. The new changes will be automatically included in your pull request.

How to choose a title for your Pull Request

Choose a title for your pull request that clearly states what it does. When fixing a bug, the usual thing to do is to use the title from the bugzilla report. Eg a title like "Fix 3797" or "Issue 3797" contains much less information than "Fix Issue 3797 - Regression(2.038): Implicit conversion between incompatible function pointers" and requires a lot more effort for the reviewers to determine if it is something they are interested in.

If a pull request isn't a trivial bug, its description should explain the motivation for the change and briefly summarize the changes.

Submitting a bug fix

If the pull request is for a bug fix, the commit message should have the format "fix issue 1234". This allow the Dlang-Bot to automatically pick up the issue from Bugzilla and post it as a comment on the PR. It's important the bot can link your commit message to the respective Bugzilla issue as it will then automatically close the issue on Bugzilla and otherwise the fixed issue won't appear in the changelog.

If the PR is already open, then a git rebase is necessary followed by a force push. During the rebase, the commit message should be renamed to match the "Fix <copy bugzilla title>"

Bugzilla issue title.png

For Issue 9582, the commit message could be Fix Issue 9582 - std.algorithm.map!(T) cause CT error for fixed size arrays.

After the pull request is created, don't forget to add a link to your pull request posted to the corresponding Bugzilla issue in a comment, so that future contributor are aware of your work and don't redo the fix. Hence, it's also helpful to add the 'pull' keyword to the Bugzilla issue.

Characteristics of a good pull request

  • Addresses one topic only.
  • Refactorings should not be mixed in with bug fixes or enhancements.
  • Refactorings should be marked as such in the subject, and must not contain any behavior changes.
  • Larger refactorings need to broken up into smaller PRs.

The problems with large PRs are:

  • They are hard to review.
  • github is very slow at serving pages with large diffs on them.
  • If the PR introduces a regression, a large diff is much harder to debug than a small one.
  • They imply an all or nothing view of it, when it actually may have good parts and bad parts.

Working on an pull request

Autotester

Pull requests are automatically picked up by the autotester, which compiles the code in the pull request and runs it through the dmd, druntime, and phobos unittests on all supported platforms. Generally, pull requests must pass all tests before they will be merged. The status of the tests can be monitored through the pull request page.

Every user must be manually approved before the autotester will start testing their pull requests. Users can be approved by anyone with commit access.

Rebasing

Sometimes, if a particular change you are working on is taking a long time, or if you encounter a problem that is fixed by a new commit upstream, you may need to sync your local branch with master in order to keep the code up-to-date. In this case, it is recommended that you use git rebase to apply your changes on top of the latest git master, so that when you submit a pull request, the change history will be easier for the reviewers to follow. git merge should not be used, as it may produce a lot of merge commits that may not be relevant to your changes.

For example, you may be working on your changes:

cd ~/dlang/phobos
git checkout mybranch
vim std/algorithm.d   # apply lots of cool changes here

First, before you resync with master, make sure all your changes are checked in (or stashed):

git commit --ammend

If you forked from the official D programming language repositories you may need to add an upstream remote to pull in the latest official changes. If this is the case you can add an upstream remote like this:

git remote add upstream git@github.com:dlang/phobos

This adds another remote to your repository called upstream and only needs to be done once. Once the upstream remote is added, you can update your repository's master branch by running the following:

git checkout master
git pull --ff-only upstream master

The --ff-only option is to ensure that your master branch is identical to the official D sources' master branch, since otherwise you will end up with a very messy history that will be hard to clean up (and the reviewers will probably reject your pull request due to having unrelated merge commits).

Now go back to your branch and rebase it:

git checkout mybranch
git rebase master

Now your sources should be up-to-date. Recompile and test everything to make sure it all works.

Note that after rebasing, you will need to force an update to your fork on GitHub with the --force-with-lease flag, otherwise it will fail because the histories don't match anymore:

git push --force-with-lease origin mybranch

You may wish to read up on how git rebase works if you're not familiar with the concept.

If, during the 'git rebase' command, you encounter conflicts, you may want to learn how to resolve a conflict during git rebase.

Squashing

After receiving feedback on your PR, it's common for it to have lots of commits that don't add much by being separate. For example, consider the following git history on a PR:

commit [ffffff] Added new function: foobar
commit [aaaaaa] Spelling error fix in foobar docs
commit [cccccc] Clarified Docs for foobar

Nothing is gained from having these as three separate commits as they are all focused on one feature. Instead, they should be one commit so the history looks like this

commit [333333] Added new function: foobar

while still retaining all of your changes. In order to perform this, please consult this guide

You can also directly append to your last commit and force an update of your PR:

git commit --amend
git push --force-with-lease

Stable Branch

If you are working on a fix for a regression, chances are it should go into the next point release, and not the next major version (e.g. 2.067.1 instead of 2.068). In this case, you should check out the stable branch of each subproject BEFORE you create your topic branch:

cd dmd
git checkout stable
cd ../druntime
git checkout stable
cd ../phobos
git checkout stable

Then follow the instructions for making a branch.

Unfortunately, it's not possible to simply re-target your branch for pulling into the stable branch. GitHub will let you do this, but your branch will include many of the changes from the unstable branch!

In order to fix such a problem, you can rebase your changes from master on top of the stable branch. First you need to pull in the stable branch from your fork on github:

git checkout stable

Then, you go back to your branch, and replay the changes from master using rebase:

git checkout mybranch
git fetch upstream
git rebase --onto upstream/stable upstream/master mybranch

You may have to follow the instructions in the Rebasing section on adding the upstream branch, substituting stable for master, if you need to update to the latest stable changes.

This sometimes may not work, as the changes between the stable and master are too drastic. In this case, you may have to re-create your changes after a clean checkout of the stable branch.

When creating a pull request, you need to tell github to target the stable branch instead of master on the upstream repository. This is done via a drop-down at the top of the page, make sure to do this before submitting your pull request as this cannot be changed after the PR is created (you will have to close the PR and create a new one).

If you notice in your PR a whole slew of changes that seem to have nothing to do with your changes, it's likely because you forgot one of these steps.

Reviews

Any pull requests that make language changes must be approved by Walter and Andrei. This includes druntime changes that implement the specification.

Any pull requests that make significant changes to code should be reviewed by more than one person. This means that at least two people need to approve the pull request before it is merged. One person must be a person with commit rights, but the other need not be, as long as that person is trusted within the developer community.

Pull requests that are trivial (typos, obvious minor bug fixes, etc.) may be pulled without a second review.

Please note that any updates pushed to the candidate branch do not automatically notify a subscribed person. If you update your branch to correct an issue, please also put in a comment indicating it.

Contributing FAQ

A file that I made a change on was modified by a different merged PR, and now my PR can't be merged, now what?

What you need to do is rebase your git branch on the master branch. What this does is rewrite the history of your git branch to make it seem like it was merged off of the head of master rather than the older commit where you actually branched. This will include the new commits in your PR so your PR no longer conflicts. See this tutorial for more details.

I would like to help but I don't know how. What is the best way?

Anyone is welcome to contribute as D is very much a volunteer effort! The best place to look for ideas to contribute is the get involved guide. Please also don't hesitate to point out (or even fix) any stumbling blocks you may encounter when starting out.

CodeCov shows a red cross

CI CodeCov failed.png

On every build the generated coverage files are sent to CodeCov for further processing. You can see the non-covered lines by clicking on the link or for further convenience in the future by installing the CodeCov browser extension.

CircleCi shows a red cross

CI CircleCI failed.png

On CircleCi static code analysis is run. For example it lints the Phobos codebase after the DStyle. Moreover, checks are run to ensure that every example on dlang.org is runnable. On Posix, you can run this locally by executing the style target:

make -f posix.mak style

The auto-tester shows a red cross

CI auto-tester failed.png

The auto-tester tests every PR on all supported platforms (Windows, Linux, macOS, and Linux) for 32 and 64-bit builds. Please click on the link of your PR to find out more about the error.

The Jenkins Project Tester shows a red cross

CI project tester.png

The Project Tester tests every PR on all supported platforms (Windows, Linux, macOS, and Linux) for 32 and 64-bit builds. Please click on the link of your PR to find out more about the error.

How can I link a PR with Bugzilla?

DLang Bot comment.png

The integration is handled by Dlang-Bot. If you mention a bugzilla issue in your git commit message, you will get linked to the Bugzilla issue. For more information, please visit Dlang-Bot's documentation.

See Also