@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 that `arc diff` is able to commit
Test Plan: Read it.
Reviewers: epriestley, btrahan
Reviewed By: epriestley
CC: aran, Korvin
Maniphest Tasks: T2025
Differential Revision: https://secure.phabricator.com/D4008
+15
-16
+15
-2
src/docs/userguide/arcanist_diff.diviner
+15
-2
src/docs/userguide/arcanist_diff.diviner
···
56
56
you haven't pushed yet". So, to **create a revision** in Git, run:
57
57
58
58
$ nano source_code.c # Make changes.
59
-
$ git commit # Commit changes.
59
+
$ git commit -a # Commit changes.
60
60
$ arc diff # Creates a new revision out of ALL unpushed commits on
61
61
# this branch.
62
+
63
+
The `git commit` step is optional. If there are uncommitted changes in the
64
+
working copy then Arcanist will ask you to create a commit from them.
62
65
63
66
Since it uses **all** the commits on the branch, you can make several commits
64
67
before sending your changes for review if you prefer.
···
77
80
To **update a revision**, just do the same thing:
78
81
79
82
$ nano source_code.c # Make more changes.
80
-
$ git commit # Commit them.
83
+
$ git commit -a # Commit them.
81
84
$ arc diff # This prompts you to update revision information.
82
85
86
+
The `git commit` step is optional. If there are uncommitted changes in the
87
+
working copy then Arcanist will ask you to amend them to the commit.
88
+
83
89
When your revision has been accepted, you can usually push it like this:
84
90
85
91
$ arc land <branch> # Merges <branch> into master and pushes.
···
103
109
$ arc diff # Creates a new revision out of ALL outgoing commits
104
110
# on this branch since the last merge.
105
111
112
+
The `hg commit` step is optional. If there are uncommitted changes in the
113
+
working copy then Arcanist will ask you to create a commit from them.
114
+
106
115
Since it uses **all** the outgoing commits on the branch, you can make several
107
116
commits before sending your changes for review if you prefer.
108
117
···
118
127
$ nano source_code.c # Make changes.
119
128
$ hg commit # Commit changes.
120
129
$ arc diff # This prompts you to update revision information.
130
+
131
+
The `hg commit` step is optional. If there are uncommitted changes in the
132
+
working copy then Arcanist will ask you to create a commit from them (or amend
133
+
them to the previous commit if supported).
121
134
122
135
When your revision has been accepted, push it normally. (`arc` does not have
123
136
push integration in Mercurial because it can't force merges and thus can't
-14
src/docs/userguide/arcanist_quick_start.diviner
-14
src/docs/userguide/arcanist_quick_start.diviner
···
72
72
For detailed instructions on using `arc diff`, see
73
73
@{article:Arcanist User Guide: arc diff}.
74
74
75
-
Subversion:
76
-
77
75
$ $EDITOR file.c
78
76
$ arc diff
79
-
80
-
Git:
81
-
82
-
$ $EDITOR file.c
83
-
$ git commit -a -m '...'
84
-
$ arc diff HEAD^
85
-
86
-
Mercurial:
87
-
88
-
$ $EDITOR file.c
89
-
$ hg commit -m '...'
90
-
$ arc diff tip^
91
77
92
78
= Next Steps =
93
79