Changes between Version 8 and Version 9 of Phabricator
- Timestamp:
- Mar 19, 2019, 1:17:55 AM (5 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Phabricator
v8 v9 44 44 Take a look at the [wiki:Phabricator#CommonproblemswithArcanist Common problems with Arcanist] section below if you have any trouble. 45 45 46 Finally, associate arc with your credentials on code.wildfiregames.comusing47 {{{ 46 Finally, associate arc with your credentials with our Phabricator instance by using 47 {{{#!sh 48 48 arc install-certificate 49 49 }}} … … 51 51 Two commands are important, that you can run at the root of a SVN clone (where .arcconfig is): 52 52 53 {{{ 53 {{{#!sh 54 54 arc patch Dn 55 55 }}} 56 56 applies the revision Dn (n being an integer) to your working copy. No need to download and apply, easy to update when a contributor updates a revision with a new diff, and more... 57 57 58 {{{ 58 {{{#!sh 59 59 arc diff --preview 60 60 }}} … … 70 70 71 71 It is recommended to generate the patch with full file context so review is eased on Phabricator. Use 72 {{{ 72 {{{#!sh 73 73 svn diff --diff-cmd=diff -x -U999999 74 74 }}} … … 78 78 79 79 If you have commit access, you can clone the non-public repository. Then, you can use 80 {{{ 80 {{{#!sh 81 81 arc patch Dn 82 82 svn st … … 85 85 86 86 The commit message must contain 87 {{{ 87 {{{#!sh 88 88 Differential Revision: https://code.wildfiregames.com/Dn 89 89 }}} … … 91 91 92 92 A useful command is 93 {{{ 93 {{{#!sh 94 94 arc commit --revision Dn --show 95 95 }}} … … 103 103 104 104 To do so, I suggest running: 105 {{{ 105 {{{#!sh 106 106 svn patch /path/to/your_patch.diff 107 107 arc diff --preview … … 121 121 * Differential revisions will be created without context ([https://secure.phabricator.com/T2465 T2465]). In order to work around the issue, you can change the behavior of `svn diff` the following way: 122 122 * Create a file called `contextdiff.bat` with the following contents: 123 {{{ 123 {{{#!bat 124 124 @echo off 125 125 diff.exe -U9999999 -L %3 -L %5 %6 %7 … … 127 127 This file will use the `diff` executable provided by the Git Bash environment, so it should work. 128 128 * Change you SVN settings: go to `%appdata%\Subversion\` and edit the `config` file. Find the line beginning with 129 {{{ 129 {{{#!bat 130 130 # diff-cmd = ... 131 131 }}} 132 132 and replace it by 133 {{{ 133 {{{#!bat 134 134 diff-cmd = X:\full\path\to\contextdiff.bat 135 135 }}} 136 136 * You can test it works by running `svn diff` in the repository: the output should contain the entire contents of the modified file. From now on `arc diff` will create diffs with context available. 137 137 * You will need to patch Arcanist against [https://secure.phabricator.com/T8075 T8075]. To do so, in your clone of the arcanist git repository, run 138 {{{ 138 {{{#!sh 139 139 git remote add oujesky https://github.com/oujesky/arcanist.git 140 140 git fetch oujesky … … 145 145 146 146 If Arcanist "cannot parse svninfo" it's because your locale outputs the result of the command "svn info" in something that is not English. You can write to your shell rc file something like 147 {{{ 147 {{{#!sh 148 148 alias arc='LANG=C LC_ALL=C arc' 149 149 }}}
