Mercurial > hg
diff tests/test-extension.t @ 46133:0a4d47f4337b
extdiff: add --from/--to and deprecate -r, as was done for `hg diff`
I recently replaced `hg diff`'s `-r` flag by `--from` and `--to` and
then deprecated the `-r` flag. This patch repeats that for
`hg extdiff`.
Differential Revision: https://phab.mercurial-scm.org/D9624
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 16 Dec 2020 21:06:29 -0800 |
parents | 56a5ea353182 |
children | 9c9e0b4b2ca7 |
line wrap: on
line diff
--- a/tests/test-extension.t Wed Dec 16 22:30:07 2020 -0800 +++ b/tests/test-extension.t Wed Dec 16 21:06:29 2020 -0800 @@ -836,10 +836,8 @@ program, use -o/--option. These will be passed before the names of the directories or files to compare. - When two revision arguments are given, then changes are shown between - those revisions. If only one revision is specified then that revision is - compared to the working directory, and, when no revisions are specified, - the working directory files are compared to its parent. + The --from, --to, and --change options work the same way they do for 'hg + diff'. The --per-file option runs the external program repeatedly on each file to diff, instead of once on two directories. By default, this happens one by @@ -859,7 +857,8 @@ -p --program CMD comparison program to run -o --option OPT [+] pass option to comparison program - -r --rev REV [+] revision + --from REV1 revision to diff from + --to REV2 revision to diff to -c --change REV change made by revision --per-file compare each file instead of revision snapshots --confirm prompt user before each external program invocation