| Index: patchconv/README.md |
| =================================================================== |
| --- a/patchconv/README.md |
| +++ b/patchconv/README.md |
| @@ -19,27 +19,31 @@ |
| $ pip install 'hg+https://hg.adblockplus.org/codingtools#egg=patchconv&subdirectory=patchconv' |
| ## Usage |
| The script in the package will be available immediately after the installation. |
| Its interface is simple: it reads from stdin and writes to stdout. |
| - $ patchconv <patch-from-rietveld.diff >git-patch.diff |
| + $ cat patch-from-rietveld.diff | patchconv >git-patch.diff |
| -For additional convenience you can use the provided `rapply.sh` script that |
| -downloads, converts and applies patches from Rietveld reviews to your local |
| -working copy. In order to use it, open a review, copy the URL of a `[raw]` |
| -download link in the top right corner of a patch set overview and then paste it |
| -into the console: |
| +You can also download the patch directly from the review and apply it directly |
| +without saving to a file: |
| + |
| + $ curl https://.../issue3322_4433.diff | patchconv | git apply |
| + |
| +This is a common sequence of commands so we have a script that automates it, |
| +for both Mercurial and Git (it autodetects the VCS). In order to use it, open a |
| +review, copy the URL of a `[raw]` download link in the top right corner of a |
| +patch set overview and then paste it into the console: |
| $ rapply.sh https://codereview.adblockplus.org/download/issue3322_4433.diff |
| -or, if you've already downloaded the diff to a local file: |
| +or, if you have already downloaded the diff to a local file: |
| $ rapply.sh issue3322_4433.diff |
| In both cases you need to be in the directory containing the repository to |
| which you are applying the diff. |
| ## Testing |