2012-01-04 10:12:59 -08:00
|
|
|
@title Differential User Guide: FAQ
|
|
|
|
@group userguide
|
|
|
|
|
|
|
|
Common questions about Differential.
|
|
|
|
|
|
|
|
= Why does an "accepted" revision remain accepted when it is updated? =
|
|
|
|
|
2014-03-25 15:41:07 -07:00
|
|
|
You can configure this behavior with `differential.sticky-accept`.
|
2012-01-04 10:12:59 -08:00
|
|
|
|
2014-03-25 15:41:07 -07:00
|
|
|
When a revision author updates an "Accepted" revision in Differential, the
|
|
|
|
state remains "Accepted". This can be confusing if you expect the revision to
|
|
|
|
change to "Needs Review" when it is updated.
|
|
|
|
|
|
|
|
Although this behavior is configurable, we think stickiness is a good behavior:
|
|
|
|
stickiness encourage authors to update revisions when they make minor changes
|
|
|
|
after a revision is accepted. For example, a reviewer may accept a change with a
|
|
|
|
comment like this:
|
2012-01-04 10:12:59 -08:00
|
|
|
|
2012-10-10 14:10:24 -07:00
|
|
|
> Looks great, but can you add some documentation for the foo() function
|
|
|
|
> before you land it? I also caught a couple typos, see inlines.
|
2012-01-04 10:12:59 -08:00
|
|
|
|
2014-03-25 15:41:07 -07:00
|
|
|
If updating the revision reverted the status to "Needs Review", the author
|
2012-01-04 10:12:59 -08:00
|
|
|
is discouraged from updating the revision when they make minor changes because
|
|
|
|
they'll have to wait for their reviewer to have a chance to look at it again.
|
|
|
|
|
2014-03-25 15:41:07 -07:00
|
|
|
Instead, the "Accepted" state is sticky to encourage them to update the revision
|
2012-01-04 10:12:59 -08:00
|
|
|
with a comment like:
|
|
|
|
|
2012-10-10 14:10:24 -07:00
|
|
|
> - Added docs.
|
|
|
|
> - Fixed typos.
|
2012-01-04 10:12:59 -08:00
|
|
|
|
|
|
|
This makes it much easier for the reviewer to go double-check those changes
|
|
|
|
later if they want, and the update tells them that the author acknowledged their
|
|
|
|
suggestions even if they don't bother to go double-check them.
|
|
|
|
|
|
|
|
If an author makes significant changes and wants to get them looked at, they can
|
|
|
|
always "request review" of an accepted revision, with a comment like:
|
|
|
|
|
2012-10-10 14:10:24 -07:00
|
|
|
> When I was testing my typo fix, I realized I actually had a bug, so I had to
|
|
|
|
> make some more changes to the bar() implementation -- can you look them over?
|
2012-01-04 10:12:59 -08:00
|
|
|
|
|
|
|
If authors are being jerks about this (making sweeping changes as soon as they
|
|
|
|
get an accept), solve the problem socially by telling them to stop being jerks.
|
|
|
|
Unless you've configured additional layers of enforcement, there's nothing
|
|
|
|
stopping them from silently changing the code before pushing it, anyway.
|
2012-03-21 17:10:12 -07:00
|
|
|
|
2014-03-25 15:41:07 -07:00
|
|
|
|
2012-03-21 17:10:12 -07:00
|
|
|
= How can I enable syntax highlighting? =
|
|
|
|
|
2012-10-10 14:10:24 -07:00
|
|
|
You need to install and configure **Pygments** to highlight anything else than
|
2014-03-25 15:41:07 -07:00
|
|
|
PHP. See the `pygments.enabled` configuration setting.
|
|
|
|
|
2012-03-21 17:10:12 -07:00
|
|
|
|
|
|
|
= What do the whitespace options mean? =
|
|
|
|
|
|
|
|
Most of these are pretty straightforward, but "Ignore Most" is not:
|
|
|
|
|
|
|
|
- **Show All**: Show all whitespace.
|
|
|
|
- **Ignore Trailing**: Ignore changes which only affect trailing whitespace.
|
|
|
|
- **Ignore Most**: Ignore changes which only affect leading or trailing
|
|
|
|
whitespace (but not whitespace changes between non-whitespace characters)
|
|
|
|
in files which are not marked as having significant whitespace.
|
|
|
|
In those files, show whitespace changes. By default, Python (.py) and
|
|
|
|
Haskell (.lhs, .hs) are marked as having significant whitespace, but this
|
|
|
|
can be changed in the `differential.whitespace-matters` configuration
|
|
|
|
setting.
|
|
|
|
- **Ignore All**: Ignore all whitespace changes in all files.
|
2012-10-10 14:10:24 -07:00
|
|
|
|
|
|
|
|
2014-03-25 15:41:07 -07:00
|
|
|
= What do the very light green and red backgrounds mean? =
|
|
|
|
|
|
|
|
Differential uses these colors to mark changes coming from rebase: they are
|
2012-10-10 14:10:24 -07:00
|
|
|
part of the diff but they were not added or removed by the author. They can
|
2014-03-25 15:41:07 -07:00
|
|
|
appear in diff of diffs against different bases.
|
|
|
|
|
|
|
|
= Next Steps =
|
|
|
|
|
|
|
|
Continue by:
|
|
|
|
|
|
|
|
- returning to the @{article:Differential User Guide}.
|