@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Document rebase background used in Differential
Summary:
Also fixed formatting.
Also linked docs.
Test Plan:
$ diviner .
Reviewers: epriestley, wez, nh
Reviewed By: epriestley
CC: aran, Korvin
Differential Revision: https://secure.phabricator.com/D3678
+24
-8
+4
src/applications/audit/application/PhabricatorApplicationAudit.php
+4
src/applications/audit/application/PhabricatorApplicationAudit.php
+4
src/applications/differential/application/PhabricatorApplicationDifferential.php
+4
src/applications/differential/application/PhabricatorApplicationDifferential.php
+16
-8
src/docs/userguide/differential_faq.diviner
+16
-8
src/docs/userguide/differential_faq.diviner
···
13
13
make minor changes after a revision is accepted. For example, a reviewer may
14
14
accept a change with a comment like this:
15
15
16
-
Looks great, but can you add some documentation for the foo() function
17
-
before you land it? I also caught a couple typos, see inlines.
16
+
> Looks great, but can you add some documentation for the foo() function
17
+
> before you land it? I also caught a couple typos, see inlines.
18
18
19
19
If updating the revision reverted the status to "needs review", the author
20
20
is discouraged from updating the revision when they make minor changes because
···
23
23
Instead, the "accept" state is sticky to encourage them to update the revision
24
24
with a comment like:
25
25
26
-
```- Added docs.
27
-
- Fixed typos.```
26
+
> - Added docs.
27
+
> - Fixed typos.
28
28
29
29
This makes it much easier for the reviewer to go double-check those changes
30
30
later if they want, and the update tells them that the author acknowledged their
···
33
33
If an author makes significant changes and wants to get them looked at, they can
34
34
always "request review" of an accepted revision, with a comment like:
35
35
36
-
When I was testing my typo fix, I realized I actually had a bug, so I had to
37
-
make some more changes to the bar() implementation -- can you look them over?
36
+
> When I was testing my typo fix, I realized I actually had a bug, so I had to
37
+
> make some more changes to the bar() implementation -- can you look them over?
38
38
39
39
If authors are being jerks about this (making sweeping changes as soon as they
40
40
get an accept), solve the problem socially by telling them to stop being jerks.
···
43
43
44
44
= How can I enable syntax highlighting? =
45
45
46
-
You need to install and configure **Pygments**. Consult the configuration file
47
-
for instructions.
46
+
You need to install and configure **Pygments** to highlight anything else than
47
+
PHP. Consult the configuration file for instructions.
48
48
49
49
= What do the whitespace options mean? =
50
50
···
60
60
can be changed in the `differential.whitespace-matters` configuration
61
61
setting.
62
62
- **Ignore All**: Ignore all whitespace changes in all files.
63
+
64
+
= What does the very light green and red backgrounds mean? =
65
+
66
+
Differential uses these colors to mark changes coming from rebase - they are
67
+
part of the diff but they were not added or removed by the author. They can
68
+
appear in diff of diffs against different bases. See
69
+
[[ https://secure.phabricator.com/D3324?vs=6468&id=6513#toc | D3324 ]] for
70
+
example.