Infrastructure/Phabricator: Difference between revisions

From KDE Community Wiki
(Reflect edit to https://phabricator.kde.org/D10289#201556)
(Mention that Phab is still used for task tracking for the time being)
 
(73 intermediate revisions by 20 users not shown)
Line 1: Line 1:
[http://phabricator.kde.org/ Phabricator] is KDE's task management and patch review system. This page is intended to serve as a general-purpose introduction to the most important aspects: submitting and reviewing patches. It should not take long before you are happily using Phabricator.
[http://phabricator.kde.org/ Phabricator] is KDE's task management system. It was used for patch review and other functions in the past, but KDE has since transitioned to GitLab, at https://invent.kde.org. Phabricator is still used for task tracking until this functionality is migrated to GitLab.
 
{{Info|Do not submit patches using Phabricator; instead use https://invent.kde.org. See [[Infrastructure/GitLab]] for details.<br/><br/>Do not submit bug reports using Phabricator; instead use https://bugs.kde.org See [[Get_Involved/Issue_Reporting]] for details.}}
 


{{Info|The KDE community does not use the Phabricator bug reporting function. We continue to use bugzilla at https://bugs.kde.org}}


= Basic Tasks =
= Basic Tasks =
== Logging in ==
== Logging in ==
Log in to [http://phabricator.kde.org/ Phabricator] with your KDE Identity account. If you don't have one, you can [https://identity.kde.org/index.php?r=registration/index sign up for one here]. At the Phabricator home page, click the "Log in" button on the top of the page and enter your KDE Identity username and password:
Log in to [http://phabricator.kde.org/ Phabricator] with your KDE Identity account. If you don't have one, you can [https://identity.kde.org/index.php?r=registration/index sign up for one here]. At the Phabricator home page, click the "Log in" button on the top of the page and enter your KDE Identity username and password:


[[File:Phabricator login 2.png ]]
[[File:Phabricator login 2.png ]]
If your KDE Identity account works on http://identity.kde.org, but not on http://phabricator.kde.org, please contact the KDE sysadmins at [email protected]
If your KDE Identity account works on http://identity.kde.org but not on http://phabricator.kde.org, please contact the KDE sysadmins at [email protected].


== Getting help ==
== Getting help ==
Line 14: Line 16:


== Posting a Patch using the website ==
== Posting a Patch using the website ==
First, create a diff file using <tt>git diff</tt> (or <tt>git format-patch</tt>) Log in to Phabricator and enter Code Review.  Click the <tt>+Create Diff</tt> button in the upper-right corner of the screen. Paste the text of the diff or upload the file using the file dialog. Select the project at the bottom; if you start typing it will perform a search among active projects. For a reviewer, use the name of the project itself (the text-field will auto-complete valid projects to help you out). In some cases, you will want to request a review from particular people instead of or in addition to the group.
Once you have [https://community.kde.org/Get_Involved/development#Set_up_your_development_environment set up your development environment] and [https://community.kde.org/Get_Involved/development#Submit_a_patch created a patch], you can submit it using Phabricator!


{{Note|1= You '''must''' make sure that there is at least one subscriber or reviewer for the diff. Phabricator automatically adds the correct subscriber(s) for many projects when the diff is submitted, but not all of them. If there are no subscribers or reviewers, nobody will get notified.}}
Log in to Phabricator and click on <tt>Code Review</tt> in the list on the left. Then, click the <tt>+Create Diff</tt> button in the upper-right corner of the screen. Paste the text of the diff or upload the file using the file dialog. Reviewers are mostly added automatically, but if your patch includes any visual or user interface changes, please add <tt>#vdg</tt> as a reviewer to make sure the [[Get Involved/design | KDE Visual Design Group]] sees it! Please make sure to add a screenshot, too.


==Formatting your patch ==
==Formatting your patch ==
Once the patch lands, the Title will become the git commit message, so please follow [https://chris.beams.io/posts/git-commit/#seven-rules commit message best practices].
The Title of your patch will become the git commit message, so please follow [https://chris.beams.io/posts/git-commit/#seven-rules commit message best practices] when creating a title for the patch.
 
In the Summary section, write at least one sentence describing your change and why it is necessary, adding more details if necessary.


=== Add special keywords ===
If your patch is intended to fix a Bugzilla ticket, include one of the following on its own line in the Summary section:
If your patch is intended to fix a Bugzilla ticket, include one of the following on its own line in the Summary section:
<pre>
<pre>
Line 31: Line 36:
(Just the Bugzilla ticket number, '''not the full URL''')
(Just the Bugzilla ticket number, '''not the full URL''')


Use <tt>BUG:</tt> If the Bugzilla describes a bug, and <tt>FEATURE</tt> if the Bugzilla ticket describes a feature request. Either of these tags will cause that Bugzilla ticket to be automatically closed when the patch is committed.
Use <tt>BUG:</tt> If the Bugzilla ticket describes a bug, and <tt>FEATURE:</tt> if the Bugzilla ticket describes a feature request. Either of these tags will cause that Bugzilla ticket to be automatically closed when the patch is committed.


If you added the <tt>BUG:</tt> or <tt>FEATURE:</tt> tag, also add another tag indicating what version receives the fix or new feature:
If you added the <tt>BUG:</tt> or <tt>FEATURE:</tt> tag, also add another tag indicating what version receives the fix or new feature:
Line 39: Line 44:
Replace <tt>[version]</tt> with an appropriate version string; see [[Guidelines and HOWTOs/Write a version string]] to find out how to write one. If you can't figure it out, don't worry about it and just omit the tag; a KDE developer will help you add it during code review.
Replace <tt>[version]</tt> with an appropriate version string; see [[Guidelines and HOWTOs/Write a version string]] to find out how to write one. If you can't figure it out, don't worry about it and just omit the tag; a KDE developer will help you add it during code review.


[https://techbase.kde.org/Development/Git/Configuration#Commit_Template Here is more information] about other special messages that interact with Bugzilla tickets. You can also add special messages that interact with [https://secure.phabricator.com/T5132 other Phabricator tools (e.g. Maniphest tasks)].
[https://techbase.kde.org/Development/Git/Configuration#Commit_Template Here is more information] about other special messages that interact with Bugzilla tickets. You can also add special messages that interact with [https://secure.phabricator.com/T5132 other Phabricator tools] (e.g. Maniphest tasks).
 
{{Note|These keywords will only work if the email address in your <tt>~/.config/git/config</tt> file matches the email address used for your https://bugs.kde.org account (See [https://techbase.kde.org/Development/Git/Configuration#Basic_Settings this page] for more information).}}
 
=== Include some screenshots ===
For patches that change something about the user interface, it's customary to include a screenshot of how the interface looks with your patch. Bonus points for including a "Before" image too, so reviewers can easily compare them.
 
== What happens next? ==
After you've submitted your patch, KDE developers who work with the software in question will review it and provide feedback. This can often take a few days. However, if nobody has responded after a week, it's likely that the review was overlooked (sorry about that!) and it's appropriate to make a comment saying, "Ping!" or something to that effect.
 
Once the patch is accepted, KDE Developers will land it for you!
 
 


= Using Arcanist to post patches =
= Using Arcanist to post patches =
== What is Arc? ==
{{warning|To repeat the caution at the top of this page, use https://invent.kde.org to submit new patches, not Phabricator and Arcanist. See [[Infrastructure/GitLab]] for details.}}
Using the web UI to post patches gets tiresome after a while. Arcanist is a tool to simplify and speed up the process of posting, updating, and merging Phabricator patches.
After you've posted a few patches, using the web UI to post patches gets tiresome. Arcanist is a tool to simplify and speed up the process of posting, updating, and merging Phabricator patches. Setting it up is easy:
 
== Installing Arcanist ==
=== Debian/Ubuntu/KDE Neon ===
{{Input|1=<nowiki>
sudo apt install arcanist
</nowiki>}}


Phabricator's fully featured command line tool to interface with your local Git repository. It can be used to submit your patches for review. After you have installed Arc, you can learn more using <tt>man arc</tt> or <tt>arc --help</tt>. Another command useful for getting a feel for Phabricator's style is <tt>arc anoid</tt>.
=== Fedora ===
kanarip/phabricator is not an official Fedora repository, so errors may occur.
{{Input|1=<nowiki>
sudo dnf copr enable kanarip/phabricator
sudo dnf install arcanist
</nowiki>}}


== Installing on Linux ==
Alternatively, install arc manually from the github repository:
Getting <tt>arc</tt> is easy on Linux; just use your distro's package manager:
{{Input|1=<nowiki>
* Debian/Ubuntu/KDE Neon: <tt>sudo apt install arcanist</tt>
sudo dnf install php-{common,cli}
* Fedora: <tt>sudo dnf install arcanist</tt>
mkdir somewhere/
* openSUSE: <tt>sudo zypper install arcanist</tt>
cd somewhere/
* Arch/Antergos/Manjaro: <tt>sudo pacman -S arcanist</tt>
git clone https://github.com/phacility/libphutil.git
* Windows: [https://secure.phabricator.com/book/phabricator/article/arcanist_windows/ Arc installation guide] The most non-obvious step is that you will need to configure your [http://php.net/manual/en/install.windows.manual.php Php installation] to use Curl. This requires editing the php.ini configuration file to add the line <tt>extension_dir = "ext"</tt> and add <tt>php_curl</tt> to the list of extensions. After adding php.exe to your path and installing arcanist/libphutil, you can run arc by defining a function in your Powershell profile: <pre> function arc { php -f "C:\path\to\arcanist.php" -- $args }</pre>
git clone https://github.com/phacility/arcanist.git
ln -s $(pwd)/arcanist/bin/arc ~/.local/bin/arc
</nowiki>}}
 
=== openSUSE ===
Tumbleweed:
{{Input|1=<nowiki>
sudo zypper ar -f https://download.opensuse.org/repositories/devel:tools:scm/openSUSE_Tumbleweed/devel:tools:scm.repo
sudo zypper install arcanist
</nowiki>}}
 
Leap 15:
{{Input|1=<nowiki>
sudo zypper ar -f https://download.opensuse.org/repositories/devel:tools:scm/openSUSE_Leap_15.0/devel:tools:scm.repo
sudo zypper install arcanist
</nowiki>}}
 
=== Arch / Manjaro ===
{{Input|1=<nowiki>
trizen -S arcanist-git
</nowiki>}}
 
=== Gentoo ===
The default portage tree does not have an ebuild, so unless you already have it, you need to add an overlay, e.g. the kde one:
 
{{Input|1=<nowiki>
sudo layman -a kde
</nowiki>}}
 
Once that is done, you can emerge it:
 
{{Input|1=<nowiki>
sudo emerge -av arcanist
</nowiki>}}
 
You might have to install and possibly unmask a few php related packages, so follow the instructions portage gives you.
 
Keep in mind that it is a vcs version (9999), which means it doesn't have release updates and you are in charge of keeping it up to date.
 
=== Windows ===
[https://secure.phabricator.com/book/phabricator/article/arcanist_windows/ Arcanist User Guide: Windows]
 
The most non-obvious step is that you will need to configure your [http://php.net/manual/en/install.windows.manual.php PHP installation] to use Curl. This requires editing the <tt>php.ini</tt> configuration file to add the line <tt>extension_dir = "ext"</tt> and add <tt>php_curl</tt> to the list of extensions. After adding <tt>php.exe</tt> to your <tt>PATH</tt> and installing arcanist/libphutil, you can run <tt>arc</tt> by defining a function in your Powershell profile:
<pre>
function arc { php -f "C:\path\to\arcanist.php" -- $args }
</pre>
 
<br/>
 
After you have installed Arc, you can learn more using <tt>man arc</tt> or <tt>arc --help</tt>. Another command useful for getting a feel for Phabricator's style is <tt>arc anoid</tt>.
 
 
=== Other operating systems ===
 
Follow the instructions from the [https://secure.phabricator.com/book/phabricator/article/arcanist_quick_start/ Arcanist Quick Start] guide.
 
== Perform one-time setup steps ==
Before you are able to use <tt>arc</tt> for work you will need to install a certificate that will allow it to login to Phabricator:
{{Input|1=<nowiki>
arc install-certificate https://phabricator.kde.org
</nowiki>}}
Just follow the instructions it provides: you will have to visit the page it indicates and copy the API token you find on that page back to the shell. (If the command fails with a cURL SSL error, you may need to set <tt>curl.cainfo</tt> in <tt>/etc/php.ini</tt> to the path to a certificate authority file on your computer, for example <tt>/etc/pki/tls/certs/ca-bundle.crt</tt> .)
 
Next, you will need to tell git who you really are, so your patches will include correct authorship information and can be attributed to yourself:
{{Input|1=<nowiki>
git config --global user.name "<Your real name>"
git config --global user.email "<Your identity.kde.org email address>"
</nowiki>}}
Both of these steps only need to be done once.


== Workflow ==
== Workflow ==
The sanest and easiest way to use <tt>arc</tt> is to follow a typical '''feature branch workflow''': keep your master branch synchronized with the upstream repository, and make all changes on separate branches.
The sanest and easiest way to use <tt>arc</tt> is to follow a typical '''feature branch workflow''': keep your master branch synchronized with the upstream repository, and make all changes on separate branches. '''Each patch needs its own private, temporary branch.''' Once your patch has been merged, delete the feature branch, and make another new branch for the next patch.
 
The following commands all need to be executed in your source directory. The hidden file/directory "<tt>.arcconfig</tt>" and "<tt>.git</tt>" tell <tt>arc</tt> what to do so you don't have to.


=== Step 1: Create a new diff ===
=== Step 1: Create a new diff ===
Before editing anything, create a new branch for your patch:
Before editing anything, create a new branch for your patch:
<pre>
{{Input|1=<nowiki>
$ git checkout -t -b <branchname> origin/master
arc feature  <name-for-your-new-branch>
</pre>
</nowiki>}}(For Git experts: this is equivalent to {{Inline-code|git checkout -t -b <name-for-your-new-branch>}})
Make changes on the feature branch. When you're ready to have your changes reviewed, do the following:
 
<pre>
Now make changes on the feature branch. When you're ready to have your changes reviewed, enter the following command:
$ git add <space-separated list of all the files you changed>
{{Input|1=<nowiki>
$ git commit
arc diff    # this will do git-add and git-commit for you; if it asks about ignoring untracked files, enter 'y'
$ arc diff
</nowiki>}}
</pre>
When you run <tt>arc diff</tt>, you will go through a series of dialogs. At the end, you will be asked to rewrite your Git commit message to fit the standard Differential format, like so:  
When you run <tt>arc diff</tt>, you will go through a series of dialogues. At the end, you will be asked to rewrite your Git commit message to fit the standard Differential format, like so:  
<pre>
<pre>
<first line of original git commit message>
<first line of original git commit message>
Line 75: Line 172:
Summary: <rest of original commit message>
Summary: <rest of original commit message>


Reviewers:  
Test Plan:


Differential Revision: <URL to the new diff>
Reviewers:
 
Subscribers:  
</pre>
</pre>


Line 84: Line 183:
As when using the web UI, enter any special Bugzilla keywords (such as <tt>BUG: 385942</tt>) on their own lines in the "Summary" section.
As when using the web UI, enter any special Bugzilla keywords (such as <tt>BUG: 385942</tt>) on their own lines in the "Summary" section.


As when using the web UI, for the "Reviewers" section, enter a hashtag for the review group--which is usually equal to the project name. For example, the review group for[https://phabricator.kde.org/project/profile/8/ Krita] is #krita and the review group for [https://phabricator.kde.org/project/profile/34/ KDE PIM]  is #kde_pim. If you can't figure out the correct hashtag, leave the Reviewers section blank for now over <tt>arc</tt>'s protestations and then edit your revision on the web UI after it's been created; you will be able to enter reviewers into a nice text box that auto-completes with valid reviewers, which is much more user-friendly.
As when using the web UI, there is no need to specifically add anyone under the "Reviewers"  or "Subscribers" sections unless your patch includes any visual or user interface changes. In this case, please add <tt>#vdg</tt> as a reviewer to make sure the [[Get Involved/design | KDE Visual Design Group]] sees it!
 
Don't touch the "Differential Revision:" section.


=== Step 2: Update your diff ===
=== Step 2: Update your diff in response to review comments ===
After <tt>arc</tt> uploads the patch to phabricator, the project's reviewers will take a look and give you some comments. If you get a thumbs up immediately, you can skip this step.  But often you will get a review like "looks good, we can take it if you fix problems x, y, and z."  Make the necessary changes, add an extra commit to the git branch, and update the Phabricator revision:
After <tt>arc</tt> uploads the patch to Phabricator, the project's reviewers will take a look and give you some comments. If you get a thumbs up immediately, you can skip this step.  But often you will get a review like "looks good, we can take it if you fix problems x, y, and z."  Make the necessary changes, add an extra commit to the git branch, and run <tt>arc diff</tt> to update the Phabricator revision. Your commit message will be added to the Phabricator revision as a new comment, so you can use it to explain your changes.
<pre>
{{Input|1=<nowiki>
[implement changes based on review comments]
[implement changes based on review comments]
$ git add -u
arc diff
$ git commit
</nowiki>}}
$ arc diff
</pre>


=== Step 3: Land your diff ===
=== Step 3: Land your diff ===
If you do not have a [[Infrastructure/Get_a_Contributor_Account | KDE Developer Account]], then someone who does will have to land your patch for you. Otherwise, you can do it yourself once the patch has been accepted and reviewers have given you permission to "ship it!"
If you do not have a [[Infrastructure/Get_a_Contributor_Account | KDE Developer Account]], then someone who does will have to land your patch for you. Otherwise, you can do it yourself once the patch has been accepted and reviewers have given you permission to "ship it!"


<pre>
First, make sure that the world is sane, and that only your patch will be landed:
$ [make sure you are on your feature branch]
{{Input|1=<nowiki>
$ arc land
[make sure you are on your feature branch]
</pre>
arc land --preview
This will squash all of the commits in your feature branch together. Phabricator aims for a tight correspondence of one commit = one change = one diff. If you don't want to squash your commits, using Arc for the last step is unnecessary, as Phabricator will monitor the repo and mark the diff as closed when it sees the commit. You can push using <tt>git push</tt> instead.  
</nowiki>}}
The output of that command should show only the commit message for your patch. If you see more than that, stop and ask your reviewers for help.
 
==== Landing on master ====
This is simple:
{{Input|1=<nowiki>
arc land
</nowiki>}}
 
==== Landing on the "Stable branch" ====
By default, arc will land the patch onto whatever branch was the parent. For example, if you branched from master, <tt>arc</tt> will land on master; if you branched from <tt>release/19.12</tt>, arc will land on that branch instead, and so on.
 
If you branched your patch from <tt>master</tt> but it is a relatively low-risk bugfix, you will often be a asked to land it on the "stable branch" instead of <tt>master</tt>. The easiest way to do this is to cherry-pick the commit from your feature branch onto the appropriate stable branch and then merge forward.
 
{{warning|If at any time you feel nervous or run into trouble, ask your reviewers for help. This can be tricky, and undoing bad merges is a pain in the neck.}}
Here is an example of how to do this with a patch branched from <tt>master</tt> that needs to go into the <tt>release/19.12</tt> stable branch (replace <tt>release/19.12</tt> with the appropriate stable branch name when you do this yourself, obviously).
 
{{Input|1=<nowiki>
[make sure you are on your feature branch]
git log -n 1 --pretty=format:"%H"
[copy that commit hash]
git checkout release/19.12
git pull
git cherry-pick [the commit hash]
git push
git branch -D [the name of your feature branch]
</nowiki>}}
 
Note that after committing to the stable branch you are expected to merge that branch to <tt>master</tt> afterwards:
{{Input|1=<nowiki>
git checkout master
git pull
git merge -s recursive -Xours release/19.12
git push
</nowiki>}}
 
==== Landing someone else's diff ====
If you have a contributor account and you are helping someone without one through the process, you will need to land their diff for them once it's been accepted. Here's how:
{{Input|1=<nowiki>
arc patch <revision ID>
git show HEAD
</nowiki>}}
 
At this point, you need to verify that the authorship information shown is correct. If it's not, you will need to ask the patch author for their real name and email address. Then you use that information to update the local commit for the patch like so:
{{Input|1=<nowiki>
# Make sure you're on the branch that corresponds to the patch!
git commit --amend --author="firstname lastname <email address>"
</nowiki>}}
 
At this point, you can land the diff normally, [[#Step 3: Land your diff|as described above]].
 


If you are new to <tt>arc</tt>, you may want to double-check the commit message before actually pushing to make sure the commit looks as intended. You can do so with <tt>arc land --hold</tt>, which will squash your feature-branch in a single commit on master, without pushing it.  <tt>arc land</tt> also assumes the upstream branch is called "origin/master." Usually, that is the case, but if you have been asked to commit to a "stable branch", you can do so using the <tt>--onto</tt> argument with the branch name, e.g: <pre>arc land --onto Applications/18.04</pre>


== Arcanist Tips & Tricks ==
== Arcanist Tips & Tricks ==
=== Look before you diff ===
You can check with <tt>arc which</tt> what Arcanist will do before performing the actual upload with <tt>arc diff</tt> if you are unsure what will happen. In particular, look for which commits will be included in your Diff.
=== arc diff: specify a revision manually ===
Sometimes - if you messed up with your git branches - arc cannot properly determine which revision (D12345) should be updated. In this case you can use <tt>arc diff --update D12345</tt>. See <tt>arc help diff</tt>.
=== Updating the summary of the Differential from the local Git commit message ===
=== Updating the summary of the Differential from the local Git commit message ===
If you changed the commit message locally and want to update the text in the summary in Differential, call Arc like this:
{{Input|1=<nowiki>
arc diff --edit --verbatim
</nowiki>}}


If you changed the commit message locally and want to update the text in the summary in Differential, call Arc like this:
=== Updating the local Git commit message from changes done on Phabricator ===
<pre>
If you or someone else updated the title, summary, test plan, reviewers or subscribers of a Diff using the web editor in Phabricator, Arcanist allows to sync those changes back to your local Git commit message:
$ arc diff --edit --verbatim
{{Input|1=<nowiki>
</pre>
arc amend
</nowiki>}}
 
Note that in general Arcanist will do this automatically for you once you <tt>arc land</tt>.
 
== Advanced Tasks ==
Once in a while, a reviewer will tell you to do specific things. This section will help you figure out what is meant to be done.
 
=== "Please do that in a separate commit" ===
Should your patch contain an unrelated change, your reviewer will ask you to undo that part and possibly open a new Diff for that. Here is what you can do:
 
If the change in question is in a separate commit on your local branch:
{{Input|1=<nowiki>
git revert <unrelated change>
arc diff # this updates the first Diff
git checkout -b <new branch name> master
git cherry-pick <unrelated change>
arc diff # this creates a new Diff for the unrelated change
</nowiki>}}
 
If you mixed different changes into a single commit on your local branch:
{{Input|1=<nowiki>
git reset HEAD^
git add -p # type "?" for help, then pick all hunks you want to keep
git stash # the stash now contains the hunks for the second patch
git commit
arc diff # this updates the first Diff
git checkout -b <new branch name> master
git stash pop
git commit
arc diff # this creates a new Diff for the unrelated change
</nowiki>}}
 
In case this does not work for you, there's always the plain old copy-and-paste. In general, it is best to avoid adding unrelated changes from the beginning. :-)


=== Marking patches as dependent on other patches ===
=== Marking patches as dependent on other patches ===
Sometimes you will want to submit a patch that depends on another patch, creating a '''dependency chain'''.
Sometimes you will want to submit a patch that depends on another patch, creating a '''dependency chain'''.


==== If each patch is intended for a different project ====
==== If each patch is intended for a different project ====
Example: you submit a patch to add new feature in KIO, and then submit another patch for Dolphin that uses that feature. Here's what you do:
Example: you submit a patch to add a new feature to KIO, and then submit another patch for Dolphin that uses that feature. Here's what you do:
<ol>
<ol>
<li>Create your first patch as above</li>
<li>Create your first patch as above</li>
<li>When creating the second patch, add the following to its own line in the "Summary" section:
<li>When creating the second patch, add the following to its own line in the "Summary" section:
<pre>Depends on DXXXX</pre>
{{Input|1=<nowiki>Depends on DXXXX</nowiki>}}
(Replace "DXXXX" with the ID of the dependent patch, '''not the full URL)'''</li>
(Replace "DXXXX" with the ID of the dependent patch, '''not the full URL)'''</li>
</ol>
</ol>
Line 132: Line 320:
<ol>
<ol>
<li>Create a branch to track the first feature:
<li>Create a branch to track the first feature:
<pre>
{{Input|1=<nowiki>
$ git checkout -t -b <branch name for feature 1> origin/master
git checkout -b <branch name for feature 1> --track origin/master
</pre>
</nowiki>}}
Then implement the feature and make a commit.
Then implement the feature and make a commit.
</li>
</li>
<li>Then create a branch for your second feature, ''tracking the first branch:''
<li>Then create a branch for your second feature, ''tracking the first branch:''
<pre>
{{Input|1=<nowiki>
git checkout -t -b <branch name for feature 2> --track <branch name for feature 1>
git checkout -b <branch name for feature 2> --track <branch name for feature 1>
</pre>
</nowiki>}}
As above, implement the feature and make a commit. Continue this pattern for any other required dependent features.
As above, implement the feature and make a commit. Continue this pattern for any other required dependent features.
</li>
</li>
Line 146: Line 334:
<li>
<li>
When you're ready to turn your dependency chain feature branches into patches, do the following:
When you're ready to turn your dependency chain feature branches into patches, do the following:
<pre>
{{Input|1=<nowiki>
$ git checkout <branch name for feature 1>
git checkout <branch name for feature 1>
$ arc diff [then go through the process of creating the patch normally]
arc diff [then go through the process of creating the patch normally]
$ git checkout <branch name for feature 2>
git checkout <branch name for feature 2>
git commit --amend  [then add the special text "Depends on DXXXX", replacing DXXXX with the ID of the first patch
git commit --amend  [then add the special text "Depends on DXXXX", replacing DXXXX with the ID of the first patch
$ arc diff [then go through the process of creating the patch normally]
arc diff [then go through the process of creating the patch normally]
</pre>
</nowiki>}}
...And so on.
...And so on.
</li>
</li>


<li>After you get comments, you will have to make changes to your patches and re-base dependent patches:
<li>After you get comments, you will have to make changes to your patches and re-base dependent patches:
<pre>
{{Input|1=<nowiki>
$ git checkout <branch name for feature 1>
git checkout <branch name for feature 1>
[Make changes]
[Make changes]
$ git add -u
git add -u
$ git commit
git commit
$ arc diff
arc diff
$ git checkout <branch name for feature 2>
git checkout <branch name for feature 2>
$ git rebase <branch name for feature 1>
git rebase <branch name for feature 1>
$ git add -u
git add -u
$ git commit
git commit
$ arc diff
arc diff
</pre>
</nowiki>}}
...And so on.
...And so on.
</li>
</li>


<li>When you're ready to land any or all of your patches, do it in sequence, starting from the patch with no unmet dependencies:
<li>When you're ready to land any or all of your patches, do it in sequence, starting from the patch with no unmet dependencies:
<pre>
{{Input|1=<nowiki>
$ git checkout <branch name for feature 1>
git checkout <branch name for feature 1>
$ arc land
arc land
$ git checkout <branch name for feature 2>
git checkout <branch name for feature 2>
$ git rebase origin/<target branch>
git rebase origin/<target branch>
$ arc land
arc land
</pre>
</nowiki>}}
</li>
</li>
</ol>
</ol>


= How to review someone else's patch =
Arcanist (<tt>arc</tt>) makes it easy to review someone's patch. But first you'll need a development environment set up. If you haven't done that yet, it's time to do so. See [[Get_Involved/development#Set_up_your_development_environment]]. Follow the instructions to compile and run the program.
== Apply the patch and compile the software ==
Find the patch's revision ID. For example, for https://phabricator.kde.org/D11184, the ID is <tt>D11184</tt>.
Now check out or enter the source repository for the software that's being patched. The repository is listed on the web UI:
[[File:Konsole repository for patch.png]]
...So this would be a patch for Konsole.
If you've never built it before, check it out and build it once first:
{{Input|1=<nowiki>
kdesrc-build konsole
</nowiki>}}
Now go to its source directory:
{{Input|1=<nowiki>
cd ~/kde/src/konsole
</nowiki>}}
...and apply the patch:
{{Input|1=<nowiki>
arc patch <revision ID>
</nowiki>}}
Answer <tt>y</tt> to any questions that are posed. Arc will automatically create a branch named <tt>arcpatch-<revision ID></tt> for the patch, so it won't damage your checkout at all.
Now it's time to compile and run the software to make sure that the patch does what it says it does and doesn't cause any regressions! Compile the patched source code:
{{Input|1=<nowiki>
kdesrc-build konsole --no-src --resume-from konsole
</nowiki>}}
Those arguments will tell <tt>kdesrc-build</tt> to not update the source code after you applied the patch, and to not build any dependencies.
If it didn't compile, that's reason alone to reject the patch! Go to the web UI and report your findings, and apply a "Request Changes" status.
== Perform QA ==
If it did compile, then it's time to perform QA, because it's important to thoroughly test patches to ensure that bad code and regressions don't slip in. '''This is the entire purpose of having a review infrastructure'''; it is very important.
First make sure the unit tests all pass:
{{Input|1=<nowiki>
cd ~kde/build/kde/applications/konsole
ctest
</nowiki>}}
If any tests fail, report this through a comment on the patch's web page (https://phabricator.kde.org/<revision ID>).
Next, execute the Test Plan that the submitter wrote. If the patch does not have a Test Plan, request one. Does it all still work for you? If not, return to the web UI and Request Changes, writing a detailed comment explaining what didn't work. It is permissible to do this even if you have not been specified as a reviewer! '''Anyone can reject a patch on the grounds that it does not work, does not do what it says it does, or causes regressions.'''
If the original Test Plan succeeds, try to break the patch. Here are some ideas:
# Remove the program's configuration file (<tt>~/.config/<program name>rc</tt> ) and re-open it
# Try the program with a HiDPI scale factor (or without one) or with a different default font size
# If it's a new feature, feed it unexpected input
# Test related functionality
'''Try to break it!''' A good patch will handle corner cases and variations in configuration. The price of configurability is vigilant testing! We owe it to our users to test using many configurations, not just the defaults or our personal settings.
== Perform code review ==
{{Note|1= Need a section on code review here, preferably written by a core KDE developer or another very experienced developer}}
== Engage with the author and other reviewers ==
After you have run the program and evaluated the patch, it's time to leave some review comments on the webpage (which again is at https://phabricator.kde.org/<revision ID>). If you have been specified as a reviewer, or are a member of a group that has been specified as a reviewer, it is permissible to Accept the patch. But keep in mind that reviewing involves responsibility: you are giving a thumbs-up to code that will be run potentially by millions of people. If you accept and land a patch that causes regressions, you will share some of the blame. It's important to take the reviewer role seriously.


= Customization =
= Customization =
Line 188: Line 437:
You can customize your Phabricator homepage by creating a new dashboard.  However, the selection of what you can post on your dashboard is limited. The defaults will show all tasks from all projects.   
You can customize your Phabricator homepage by creating a new dashboard.  However, the selection of what you can post on your dashboard is limited. The defaults will show all tasks from all projects.   


To narrow this down, you need to define a custom query to serve as a filter. For example, if you work on Plasma Mobile and want to monitor the to-do list, perhaps you want to show only tasks which are in the Plasma Mobile and are tagged as open. To do that, enter Maniphest, select "advanced search," select the appropriate terms, then click "save custom query." You can give your query a name. Once it is saved, the query will become available as a new filter for creating feeds on your dashboard. (In Differential you seem to need to perform the test search before the "save query" button becomes visible.)
To narrow this down, you need to define a custom query to serve as a filter. For example, if you work on Plasma Mobile and want to monitor the to-do list, perhaps you want to show only tasks that are in Plasma Mobile and are tagged as open. To do that, enter Maniphest, select "advanced search," select the appropriate terms, then click "save custom query." You can give your query a name. Once it is saved, the query will become available as a new filter for creating feeds on your dashboard. (In Differential you seem to need to perform the test search before the "save query" button becomes visible.)

Latest revision as of 01:54, 12 July 2020

Phabricator is KDE's task management system. It was used for patch review and other functions in the past, but KDE has since transitioned to GitLab, at https://invent.kde.org. Phabricator is still used for task tracking until this functionality is migrated to GitLab.

Information

Do not submit patches using Phabricator; instead use https://invent.kde.org. See Infrastructure/GitLab for details.

Do not submit bug reports using Phabricator; instead use https://bugs.kde.org See Get_Involved/Issue_Reporting for details.



Basic Tasks

Logging in

Log in to Phabricator with your KDE Identity account. If you don't have one, you can sign up for one here. At the Phabricator home page, click the "Log in" button on the top of the page and enter your KDE Identity username and password:

If your KDE Identity account works on http://identity.kde.org but not on http://phabricator.kde.org, please contact the KDE sysadmins at [email protected].

Getting help

The official documentation is in the Phabricator book and on their website -- note that since everything is under rapid development, most of the documentation is incomplete. A good way to find the information you're looking for is to search Phabricator upstream.

Posting a Patch using the website

Once you have set up your development environment and created a patch, you can submit it using Phabricator!

Log in to Phabricator and click on Code Review in the list on the left. Then, click the +Create Diff button in the upper-right corner of the screen. Paste the text of the diff or upload the file using the file dialog. Reviewers are mostly added automatically, but if your patch includes any visual or user interface changes, please add #vdg as a reviewer to make sure the KDE Visual Design Group sees it! Please make sure to add a screenshot, too.

Formatting your patch

The Title of your patch will become the git commit message, so please follow commit message best practices when creating a title for the patch.

In the Summary section, write at least one sentence describing your change and why it is necessary, adding more details if necessary.

Add special keywords

If your patch is intended to fix a Bugzilla ticket, include one of the following on its own line in the Summary section:

BUG: 385942

or

FEATURE: 384936

(Just the Bugzilla ticket number, not the full URL)

Use BUG: If the Bugzilla ticket describes a bug, and FEATURE: if the Bugzilla ticket describes a feature request. Either of these tags will cause that Bugzilla ticket to be automatically closed when the patch is committed.

If you added the BUG: or FEATURE: tag, also add another tag indicating what version receives the fix or new feature:

FIXED-IN: [version]

Replace [version] with an appropriate version string; see Guidelines and HOWTOs/Write a version string to find out how to write one. If you can't figure it out, don't worry about it and just omit the tag; a KDE developer will help you add it during code review.

Here is more information about other special messages that interact with Bugzilla tickets. You can also add special messages that interact with other Phabricator tools (e.g. Maniphest tasks).

Note

These keywords will only work if the email address in your ~/.config/git/config file matches the email address used for your https://bugs.kde.org account (See this page for more information).


Include some screenshots

For patches that change something about the user interface, it's customary to include a screenshot of how the interface looks with your patch. Bonus points for including a "Before" image too, so reviewers can easily compare them.

What happens next?

After you've submitted your patch, KDE developers who work with the software in question will review it and provide feedback. This can often take a few days. However, if nobody has responded after a week, it's likely that the review was overlooked (sorry about that!) and it's appropriate to make a comment saying, "Ping!" or something to that effect.

Once the patch is accepted, KDE Developers will land it for you!


Using Arcanist to post patches

Warning

To repeat the caution at the top of this page, use https://invent.kde.org to submit new patches, not Phabricator and Arcanist. See Infrastructure/GitLab for details.

After you've posted a few patches, using the web UI to post patches gets tiresome. Arcanist is a tool to simplify and speed up the process of posting, updating, and merging Phabricator patches. Setting it up is easy:

Installing Arcanist

Debian/Ubuntu/KDE Neon

sudo apt install arcanist

Fedora

kanarip/phabricator is not an official Fedora repository, so errors may occur.

sudo dnf copr enable kanarip/phabricator
sudo dnf install arcanist

Alternatively, install arc manually from the github repository:

sudo dnf install php-{common,cli}
mkdir somewhere/
cd somewhere/
git clone https://github.com/phacility/libphutil.git
git clone https://github.com/phacility/arcanist.git
ln -s $(pwd)/arcanist/bin/arc ~/.local/bin/arc

openSUSE

Tumbleweed:

sudo zypper ar -f https://download.opensuse.org/repositories/devel:tools:scm/openSUSE_Tumbleweed/devel:tools:scm.repo
sudo zypper install arcanist

Leap 15:

sudo zypper ar -f https://download.opensuse.org/repositories/devel:tools:scm/openSUSE_Leap_15.0/devel:tools:scm.repo
sudo zypper install arcanist

Arch / Manjaro

trizen -S arcanist-git

Gentoo

The default portage tree does not have an ebuild, so unless you already have it, you need to add an overlay, e.g. the kde one:

sudo layman -a kde

Once that is done, you can emerge it:

sudo emerge -av arcanist

You might have to install and possibly unmask a few php related packages, so follow the instructions portage gives you.

Keep in mind that it is a vcs version (9999), which means it doesn't have release updates and you are in charge of keeping it up to date.

Windows

Arcanist User Guide: Windows

The most non-obvious step is that you will need to configure your PHP installation to use Curl. This requires editing the php.ini configuration file to add the line extension_dir = "ext" and add php_curl to the list of extensions. After adding php.exe to your PATH and installing arcanist/libphutil, you can run arc by defining a function in your Powershell profile:

function arc { php -f "C:\path\to\arcanist.php" -- $args }


After you have installed Arc, you can learn more using man arc or arc --help. Another command useful for getting a feel for Phabricator's style is arc anoid.


Other operating systems

Follow the instructions from the Arcanist Quick Start guide.

Perform one-time setup steps

Before you are able to use arc for work you will need to install a certificate that will allow it to login to Phabricator:

arc install-certificate https://phabricator.kde.org

Just follow the instructions it provides: you will have to visit the page it indicates and copy the API token you find on that page back to the shell. (If the command fails with a cURL SSL error, you may need to set curl.cainfo in /etc/php.ini to the path to a certificate authority file on your computer, for example /etc/pki/tls/certs/ca-bundle.crt .)

Next, you will need to tell git who you really are, so your patches will include correct authorship information and can be attributed to yourself:

git config --global user.name "<Your real name>"
git config --global user.email "<Your identity.kde.org email address>"

Both of these steps only need to be done once.

Workflow

The sanest and easiest way to use arc is to follow a typical feature branch workflow: keep your master branch synchronized with the upstream repository, and make all changes on separate branches. Each patch needs its own private, temporary branch. Once your patch has been merged, delete the feature branch, and make another new branch for the next patch.

The following commands all need to be executed in your source directory. The hidden file/directory ".arcconfig" and ".git" tell arc what to do so you don't have to.

Step 1: Create a new diff

Before editing anything, create a new branch for your patch:

arc feature  <name-for-your-new-branch>

(For Git experts: this is equivalent to git checkout -t -b <name-for-your-new-branch>)

Now make changes on the feature branch. When you're ready to have your changes reviewed, enter the following command:

arc diff     # this will do git-add and git-commit for you; if it asks about ignoring untracked files, enter 'y'

When you run arc diff, you will go through a series of dialogs. At the end, you will be asked to rewrite your Git commit message to fit the standard Differential format, like so:

<first line of original git commit message>

Summary: <rest of original commit message>

Test Plan:

Reviewers:

Subscribers: 

<first line of original git commit message> will become the commit message, so please follow commit message best practices.

As when using the web UI, enter any special Bugzilla keywords (such as BUG: 385942) on their own lines in the "Summary" section.

As when using the web UI, there is no need to specifically add anyone under the "Reviewers" or "Subscribers" sections unless your patch includes any visual or user interface changes. In this case, please add #vdg as a reviewer to make sure the KDE Visual Design Group sees it!

Step 2: Update your diff in response to review comments

After arc uploads the patch to Phabricator, the project's reviewers will take a look and give you some comments. If you get a thumbs up immediately, you can skip this step. But often you will get a review like "looks good, we can take it if you fix problems x, y, and z." Make the necessary changes, add an extra commit to the git branch, and run arc diff to update the Phabricator revision. Your commit message will be added to the Phabricator revision as a new comment, so you can use it to explain your changes.

[implement changes based on review comments]
arc diff

Step 3: Land your diff

If you do not have a KDE Developer Account, then someone who does will have to land your patch for you. Otherwise, you can do it yourself once the patch has been accepted and reviewers have given you permission to "ship it!"

First, make sure that the world is sane, and that only your patch will be landed:

[make sure you are on your feature branch]
arc land --preview

The output of that command should show only the commit message for your patch. If you see more than that, stop and ask your reviewers for help.

Landing on master

This is simple:

arc land

Landing on the "Stable branch"

By default, arc will land the patch onto whatever branch was the parent. For example, if you branched from master, arc will land on master; if you branched from release/19.12, arc will land on that branch instead, and so on.

If you branched your patch from master but it is a relatively low-risk bugfix, you will often be a asked to land it on the "stable branch" instead of master. The easiest way to do this is to cherry-pick the commit from your feature branch onto the appropriate stable branch and then merge forward.

Warning

If at any time you feel nervous or run into trouble, ask your reviewers for help. This can be tricky, and undoing bad merges is a pain in the neck.

Here is an example of how to do this with a patch branched from master that needs to go into the release/19.12 stable branch (replace release/19.12 with the appropriate stable branch name when you do this yourself, obviously).

[make sure you are on your feature branch]
git log -n 1 --pretty=format:"%H"
[copy that commit hash]
git checkout release/19.12
git pull
git cherry-pick [the commit hash]
git push
git branch -D [the name of your feature branch]

Note that after committing to the stable branch you are expected to merge that branch to master afterwards:

git checkout master
git pull
git merge -s recursive -Xours release/19.12
git push

Landing someone else's diff

If you have a contributor account and you are helping someone without one through the process, you will need to land their diff for them once it's been accepted. Here's how:

arc patch <revision ID>
git show HEAD

At this point, you need to verify that the authorship information shown is correct. If it's not, you will need to ask the patch author for their real name and email address. Then you use that information to update the local commit for the patch like so:

# Make sure you're on the branch that corresponds to the patch!
git commit --amend --author="firstname lastname <email address>"

At this point, you can land the diff normally, as described above.


Arcanist Tips & Tricks

Look before you diff

You can check with arc which what Arcanist will do before performing the actual upload with arc diff if you are unsure what will happen. In particular, look for which commits will be included in your Diff.

arc diff: specify a revision manually

Sometimes - if you messed up with your git branches - arc cannot properly determine which revision (D12345) should be updated. In this case you can use arc diff --update D12345. See arc help diff.

Updating the summary of the Differential from the local Git commit message

If you changed the commit message locally and want to update the text in the summary in Differential, call Arc like this:

arc diff --edit --verbatim

Updating the local Git commit message from changes done on Phabricator

If you or someone else updated the title, summary, test plan, reviewers or subscribers of a Diff using the web editor in Phabricator, Arcanist allows to sync those changes back to your local Git commit message:

arc amend

Note that in general Arcanist will do this automatically for you once you arc land.

Advanced Tasks

Once in a while, a reviewer will tell you to do specific things. This section will help you figure out what is meant to be done.

"Please do that in a separate commit"

Should your patch contain an unrelated change, your reviewer will ask you to undo that part and possibly open a new Diff for that. Here is what you can do:

If the change in question is in a separate commit on your local branch:

git revert <unrelated change>
arc diff # this updates the first Diff
git checkout -b <new branch name> master
git cherry-pick <unrelated change>
arc diff # this creates a new Diff for the unrelated change

If you mixed different changes into a single commit on your local branch:

git reset HEAD^
git add -p # type "?" for help, then pick all hunks you want to keep
git stash # the stash now contains the hunks for the second patch
git commit
arc diff # this updates the first Diff
git checkout -b <new branch name> master
git stash pop
git commit
arc diff # this creates a new Diff for the unrelated change

In case this does not work for you, there's always the plain old copy-and-paste. In general, it is best to avoid adding unrelated changes from the beginning. :-)

Marking patches as dependent on other patches

Sometimes you will want to submit a patch that depends on another patch, creating a dependency chain.

If each patch is intended for a different project

Example: you submit a patch to add a new feature to KIO, and then submit another patch for Dolphin that uses that feature. Here's what you do:

  1. Create your first patch as above
  2. When creating the second patch, add the following to its own line in the "Summary" section:
    Depends on DXXXX
    (Replace "DXXXX" with the ID of the dependent patch, not the full URL)

If the patches are all for the same project

Example: you are implementing multiple new features for a single project that each depend on the patch for the prior feature. Here's what you do:

  1. Create a branch to track the first feature:
    git checkout -b <branch name for feature 1> --track origin/master
    

    Then implement the feature and make a commit.

  2. Then create a branch for your second feature, tracking the first branch:
    git checkout -b <branch name for feature 2> --track <branch name for feature 1>
    

    As above, implement the feature and make a commit. Continue this pattern for any other required dependent features.

  3. When you're ready to turn your dependency chain feature branches into patches, do the following:
    git checkout <branch name for feature 1>
    arc diff [then go through the process of creating the patch normally]
    git checkout <branch name for feature 2>
    git commit --amend  [then add the special text "Depends on DXXXX", replacing DXXXX with the ID of the first patch
    arc diff [then go through the process of creating the patch normally]
    

    ...And so on.

  4. After you get comments, you will have to make changes to your patches and re-base dependent patches:
    git checkout <branch name for feature 1>
    [Make changes]
    git add -u
    git commit
    arc diff
    git checkout <branch name for feature 2>
    git rebase <branch name for feature 1>
    git add -u
    git commit
    arc diff
    

    ...And so on.

  5. When you're ready to land any or all of your patches, do it in sequence, starting from the patch with no unmet dependencies:
    git checkout <branch name for feature 1>
    arc land
    git checkout <branch name for feature 2>
    git rebase origin/<target branch>
    arc land
    

How to review someone else's patch

Arcanist (arc) makes it easy to review someone's patch. But first you'll need a development environment set up. If you haven't done that yet, it's time to do so. See Get_Involved/development#Set_up_your_development_environment. Follow the instructions to compile and run the program.

Apply the patch and compile the software

Find the patch's revision ID. For example, for https://phabricator.kde.org/D11184, the ID is D11184.

Now check out or enter the source repository for the software that's being patched. The repository is listed on the web UI: ...So this would be a patch for Konsole.

If you've never built it before, check it out and build it once first:

kdesrc-build konsole

Now go to its source directory:

cd ~/kde/src/konsole

...and apply the patch:

arc patch <revision ID>

Answer y to any questions that are posed. Arc will automatically create a branch named arcpatch-<revision ID> for the patch, so it won't damage your checkout at all.

Now it's time to compile and run the software to make sure that the patch does what it says it does and doesn't cause any regressions! Compile the patched source code:

kdesrc-build konsole --no-src --resume-from konsole

Those arguments will tell kdesrc-build to not update the source code after you applied the patch, and to not build any dependencies.

If it didn't compile, that's reason alone to reject the patch! Go to the web UI and report your findings, and apply a "Request Changes" status.

Perform QA

If it did compile, then it's time to perform QA, because it's important to thoroughly test patches to ensure that bad code and regressions don't slip in. This is the entire purpose of having a review infrastructure; it is very important.

First make sure the unit tests all pass:

cd ~kde/build/kde/applications/konsole
ctest

If any tests fail, report this through a comment on the patch's web page (https://phabricator.kde.org/<revision ID>).

Next, execute the Test Plan that the submitter wrote. If the patch does not have a Test Plan, request one. Does it all still work for you? If not, return to the web UI and Request Changes, writing a detailed comment explaining what didn't work. It is permissible to do this even if you have not been specified as a reviewer! Anyone can reject a patch on the grounds that it does not work, does not do what it says it does, or causes regressions.

If the original Test Plan succeeds, try to break the patch. Here are some ideas:

  1. Remove the program's configuration file (~/.config/<program name>rc ) and re-open it
  2. Try the program with a HiDPI scale factor (or without one) or with a different default font size
  3. If it's a new feature, feed it unexpected input
  4. Test related functionality

Try to break it! A good patch will handle corner cases and variations in configuration. The price of configurability is vigilant testing! We owe it to our users to test using many configurations, not just the defaults or our personal settings.

Perform code review

Note

Need a section on code review here, preferably written by a core KDE developer or another very experienced developer


Engage with the author and other reviewers

After you have run the program and evaluated the patch, it's time to leave some review comments on the webpage (which again is at https://phabricator.kde.org/<revision ID>). If you have been specified as a reviewer, or are a member of a group that has been specified as a reviewer, it is permissible to Accept the patch. But keep in mind that reviewing involves responsibility: you are giving a thumbs-up to code that will be run potentially by millions of people. If you accept and land a patch that causes regressions, you will share some of the blame. It's important to take the reviewer role seriously.

Customization

Creating custom dashboard feeds

You can customize your Phabricator homepage by creating a new dashboard. However, the selection of what you can post on your dashboard is limited. The defaults will show all tasks from all projects.

To narrow this down, you need to define a custom query to serve as a filter. For example, if you work on Plasma Mobile and want to monitor the to-do list, perhaps you want to show only tasks that are in Plasma Mobile and are tagged as open. To do that, enter Maniphest, select "advanced search," select the appropriate terms, then click "save custom query." You can give your query a name. Once it is saved, the query will become available as a new filter for creating feeds on your dashboard. (In Differential you seem to need to perform the test search before the "save query" button becomes visible.)