This is a guide to reviewing and merging contributions to Wikimedia code repositories, written primarily for developers performing code reviews.
- For developers submitting code for review, see Getting your code reviewed.
- For an introduction to the Gerrit tool (commenting on code; comparing patch sets), see the Gerrit tutorial.
- Provide quick reviews to avoid bitrot and feelings of abandonment. Fast feedback encourages developers to continue contributing and hence helps broadening our contributor base.
- Be nice. Contributed patches are gifts. Reviews influence the perception a volunteer will have about the entire project.
- In the long run, encourage code contributors to also become reviewers.
Finding patches to reviewEdit
There is a lot of code to review. How to break up the task into more manageable portions?
There are several basic patterns:
If you are a maintainer, consider setting up email notifications for new patchsets in your projects (repositories) via "Watched Projects" in Gerrit (or "Owners" in a future Differential world). Alternatively you can add yourself to the Gerrit Reviewer Bot which will automatically add you as a reviewer to each new patchset.
- Identify major pieces of work or sets of related revisions. A quick chronological review can be a good way to do this; or you can choose a repository with many open changesets.
- Open all changeset pages as tabs in a browser window. Open relevant files in a text editor.
- Review new or unfamiliar files in their entirety. Pick a changeset with a major change to the relevant file and review.
- Pick an author with (many) open changesets, load them in Gerrit.
- Work through the revisions chronologically, or proceed one topic/repository at a time.
- This method allows the reviewer to get to know individual developers: their skills, faults and interests. The work has a sense of progress and continuity.
If someone already added you as a potential reviewer and you know you will not review the patch, remove yourself from the list of reviewers.
New contributors to our projectsEdit
You can add (some of) the queries below to your menu by editing your user preferences. A "new contributor" is defined as a person who has contributed five or less changesets in total.
- Open changesets by new contributors successfully verified by Jenkins bot and awaiting reviewer feedback
- Review the patch if you are familiar with the repository and make a decision (CR±1 or CR±2).
- Open changesets by new contributors successfully verified by Jenkins bot and approved by a reviewer (CR>0)
- Help make a decision (CR±1, or CR-2, or CR+2 if you have +2 rights for the repository).
- Open changesets by new contributors successfully verified by Jenkins bot and disapproved by a reviewer (CR<0)
- Ask if the contributor needs any help and if the contributor plans to continue improving the changeset.
- Open changesets by new contributors not successfully verified by Jenkins bot
- Ask if the contributor needs any help and if the contributor plans to continue improving the changeset.
- The results of the queries above are all included in this single query: All open changesets by new contributors
Chronological (and Reverse Chronological)Edit
- Start at the oldest open changeset, review until you finish the queue. Alternately, start at the latest revision and read each diff in turn until you reach the end. This approach is good for minor revisions, but requires constant switching between projects and their contexts.
Is it wantedEdit
- The very first question is whether the contribution is a good idea. If the contribution is not helpful or does not align with the direction and scope of the project, explain and provide feedback on better ideas.
- Contributed code should work as advertised, that is, any bugs found in the code should be fixed. (But be careful not to blame the current developer for code written by a previous developer.)
- Aim for interface stability and backwards compatibility.
- Review public interfaces carefully, so that future changes can be kept to a minimum.
- Read relevant bug reports or documentation.
- Familiarise yourself with any relevant technical issues. Read relevant specifications or manual sections.
- Database schema changes or changes to high-traffic queries should be reviewed by a database expert. (A corresponding Phabricator task should have the tag "schema-change" associated.)
- Code that is run many times in a request, or code that is run on startup, should be reviewed for performance (e.g. by a member of the Wikimedia Performance Team). Suspicious code may need to be benchmarked.
- Any web-accessible code which is very inefficient (in time, memory, query count, etc.) should be flagged for a fix (e.g. by creating a performance task in Phabricator).
- Does this change make the user experience better or worse for end users? If it has a user experience or visual design impact, consider consulting connect or the design mailing list, or one of the design maintainers.
- Ensure the coding style conventions are followed, such as whitespace, line length, brace placement, etc. This is easy to check.
- Functions should do what their names say. Choosing the correct verb is essential, a get*() function should get something, a set*() function should set something.
- Variables names should use English, abbreviations should be avoided where possible.
- Doc comments on functions are preferred.
- Overly-complicated code should be simplified. This usually means making it longer. For instance:
- Ternary operators (?:) may need to be replaced with if/else.
- Long expressions may need to be broken up into several statements.
- Clever use of operator precedence, shortcut evaluation, assignment expressions, etc. may need to be rewritten.
- Duplication, whether within files or across files, should be avoided.
- It is bad for readability since it's necessary to play "spot the difference" to work out what has changed. Reading many near-copies of some code necessarily takes longer than reading a single abstraction.
- It is bad for maintainability, since if a bug (or missing feature) is found in the copied code, all instances of it have to be fixed.
- Some new developers might copy large sections of code from other extensions or from the core, and change some minor details in it. If a developer seems to be writing code which is "too good" for their level of experience, try grep'ing the code base for some code fragments, to identify the source. Guide the developer towards either rewriting or refactoring.
- Taking shortcuts can be counterproductive, since the amount of time spent figuring out the shortcut and verifying that it works could have been spent just typing out the original idea in full.
- The reviewer should have read and understood the security guide and should be aware of the security issues discussed there.
- There should not be the remotest possibility of arbitrary server-side code execution. This means that there should be no eval() or create_function(), and no /e modifier on preg_replace().
- Check for text protocol injection issues (XSS, SQL injection, etc.) Insist on output-side escaping.
- Check for register_globals issues, especially classic arbitrary inclusion vulnerabilities.
- Check any write actions for CSRF.
- Be wary of special entry points which may bypass the security provisions in WebStart.php.
- Be wary of unnecessary duplication of security-relevant MW core functionality, such as using $_REQUEST instead of $wgRequest, or escaping SQL with addslashes() instead of $dbr->addQuotes().
- If in doubt, consider contacting the Wikimedia Security Team.
- Names which are in a shared (global) namespace should be prefixed (or otherwise specific to the extension in question) to avoid conflicts between extensions. This includes:
- Global variables
- Global functions
- Class names
- Message names
- Table names
- The aim of modularity is to separate concerns. Modules should not depend on each other in unexpected or complex ways. The interfaces between modules should be as simple as possible without resorting to code duplication.
- Point out shortcuts and ask the developer to do a proper job.
Complete the reviewEdit
Giving positive feedbackEdit
- If you want to help to review the code, but don't feel comfortable (yet) making the final decision, you can use
+1in Gerrit and indicate whether you've "verified" and/or "inspected" the code.
- If the revision is good and has passed all tests above, mark it
+2in Gerrit. If you are particularly impressed by someone's work, say so in a comment. When you mark a commit with
+2, you're saying:
- I've inspected this code, and
- the code makes sense, and
- the code works and does something that we want to do, and
- the code doesn't do anything that we don't want it to do, and
- the code follows our development guidelines, and
- the code will still make sense in five years.
Giving negative feedbackEdit
- If the revision is trivial, broken and has no obvious value, mark the commit as "-2"
- If the revision has issues but also has some utility, or is showing signs of heading in the right direction, mark it
-1and add a comment explaining what is wrong and how to fix it. Never mark something
-1without adding a comment. If someone marks your code
-1it means that your code is good, but needs improvement.
You have to weigh up the costs and benefits of each course of action. If you reject the change completely (-2), then that change will be lost, and the developer may be discouraged. If you tolerate the fault, the end product will suffer. If you fix it yourself, then you're letting yourself get distracted, and perhaps you're making the developer believe that it is acceptable to submit low-quality code and then let someone else worry about the details.
General guidelines on comment style, especially when giving negative feedback:
- Focus your comments on the code and any objectively-observed behavior, not motivations; for example, don't state or imply assumptions about motivating factors like whether the developer was too lazy or unexperienced to do things right. Ask questions instead of making demands to foster a technical discussion: "What do you think about...?" "Did you consider...?" "Can you clarify...?"
- Be empathetic and kind. Recognize that the developer has probably put a lot of work in their idea, and thank them for their contribution if you feel comfortable and sincere in doing so. "Why didn't you just..." provides a judgement, putting people on the defensive. Be positive.
- Let them know where they can appeal your decision. For example, invite them to discuss the issue on mail:wikitech-l or on IRC.
- Be clear. Don't sugarcoat things so much that the central message is obscured.
- Most importantly, give the feedback quickly. Don't just leave negative feedback to someone else or hope they aren't persistent enough to get their contribution accepted.