This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9624

extdiff: add --from/--to and deprecate -r, as was done for `hg diff`
ClosedPublic

Authored by martinvonz on Dec 17 2020, 2:12 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0a4d47f4337b: extdiff: add --from/--to and deprecate -r, as was done for `hg diff`
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 17 2020, 2:12 AM
pulkit accepted this revision.Dec 17 2020, 5:59 AM
pulkit added a subscriber: pulkit.

Probably add a relnotes entry as followup.

This revision is now accepted and ready to land.Dec 17 2020, 5:59 AM
martinvonz added a comment.Dec 17 2020, 11:33 AM
In D9624#144827, @pulkit wrote:

Probably add a relnotes entry as followup.

Right, I meant to include that :( Thanks for the reminder. I'll send it in a followup, perhaps in a chain with hg status --from/--to.

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (20 lines)
Mtests/test-extdiff.t (13 lines)
Mtests/test-extension.t (9 lines)

Diff 24330

hgext/extdiff.py

- copy to a temp structure if diffing 2 internal revisions - copy to a temp structure if diffing 2 internal revisions
- copy to a temp structure if diffing working revision with - copy to a temp structure if diffing working revision with
another one and more than 1 file is changed another one and more than 1 file is changed
- just invoke the diff for a single file in the working dir - just invoke the diff for a single file in the working dir
""" """
cmdutil.check_at_most_one_arg(opts, b'rev', b'change') cmdutil.check_at_most_one_arg(opts, b'rev', b'change')
revs = opts.get(b'rev') revs = opts.get(b'rev')
from_rev = opts.get(b'from')
to_rev = opts.get(b'to')
change = opts.get(b'change') change = opts.get(b'change')
do3way = b'$parent2' in cmdline do3way = b'$parent2' in cmdline
if change: if change:
ctx2 = scmutil.revsingle(repo, change, None) ctx2 = scmutil.revsingle(repo, change, None)
ctx1a, ctx1b = ctx2.p1(), ctx2.p2() ctx1a, ctx1b = ctx2.p1(), ctx2.p2()
elif from_rev or to_rev:
repo = scmutil.unhidehashlikerevs(
repo, [from_rev] + [to_rev], b'nowarn'
)
ctx1a = scmutil.revsingle(repo, from_rev, None)
ctx1b = repo[nullid]
ctx2 = scmutil.revsingle(repo, to_rev, None)
else: else:
ctx1a, ctx2 = scmutil.revpair(repo, revs) ctx1a, ctx2 = scmutil.revpair(repo, revs)
if not revs: if not revs:
ctx1b = repo[None].p2() ctx1b = repo[None].p2()
else: else:
ctx1b = repo[nullid] ctx1b = repo[nullid]
# Disable 3-way merge if there is only one parent # Disable 3-way merge if there is only one parent
[ [
( (
b'o', b'o',
b'option', b'option',
[], [],
_(b'pass option to comparison program'), _(b'pass option to comparison program'),
_(b'OPT'), _(b'OPT'),
), ),
(b'r', b'rev', [], _(b'revision'), _(b'REV')), (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
(b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
(b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
(b'c', b'change', b'', _(b'change made by revision'), _(b'REV')), (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
( (
b'', b'',
b'per-file', b'per-file',
False, False,
_(b'compare each file instead of revision snapshots'), _(b'compare each file instead of revision snapshots'),
), ),
( (
default options "-Npru". default options "-Npru".
To select a different program, use the -p/--program option. The To select a different program, use the -p/--program option. The
program will be passed the names of two directories to compare, program will be passed the names of two directories to compare,
unless the --per-file option is specified (see below). To pass unless the --per-file option is specified (see below). To pass
additional options to the program, use -o/--option. These will be additional options to the program, use -o/--option. These will be
passed before the names of the directories or files to compare. passed before the names of the directories or files to compare.
When two revision arguments are given, then changes are shown The --from, --to, and --change options work the same way they do for
between those revisions. If only one revision is specified then :hg:`diff`.
that revision is compared to the working directory, and, when no
revisions are specified, the working directory files are compared
to its parent.
The --per-file option runs the external program repeatedly on each The --per-file option runs the external program repeatedly on each
file to diff, instead of once on two directories. By default, file to diff, instead of once on two directories. By default,
this happens one by one, where the next file diff is open in the this happens one by one, where the next file diff is open in the
external program only once the previous external program (for the external program only once the previous external program (for the
previous file diff) has exited. If the external program has a previous file diff) has exited. If the external program has a
graphical interface, it can open all the file diffs at once instead graphical interface, it can open all the file diffs at once instead
of one by one. See :hg:`help -e extdiff` for information about how of one by one. See :hg:`help -e extdiff` for information about how

tests/test-extdiff.t

When two revision arguments are given, then changes are shown between When two revision arguments are given, then changes are shown between
those revisions. If only one revision is specified then that revision is those revisions. If only one revision is specified then that revision is
compared to the working directory, and, when no revisions are specified, compared to the working directory, and, when no revisions are specified,
the working directory files are compared to its parent. the working directory files are compared to its parent.
options ([+] can be repeated): options ([+] can be repeated):
-o --option OPT [+] pass option to comparison program -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 -c --change REV change made by revision
--per-file compare each file instead of revision snapshots --per-file compare each file instead of revision snapshots
--confirm prompt user before each external program invocation --confirm prompt user before each external program invocation
--patch compare patches for two revisions --patch compare patches for two revisions
-I --include PATTERN [+] include names matching the given patterns -I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns
-S --subrepos recurse into subrepositories -S --subrepos recurse into subrepositories
(some details hidden, use --verbose to show complete help) (some details hidden, use --verbose to show complete help)
$ hg ci -d '0 0' -mtest1 $ hg ci -d '0 0' -mtest1
$ echo b >> a $ echo b >> a
$ hg ci -d '1 0' -mtest2 $ hg ci -d '1 0' -mtest2
Should diff cloned files directly: Should diff cloned files directly:
$ hg falabala -r 0:1 $ hg falabala --from 0 --to 1
diffing "*\\extdiff.*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) (windows !) diffing "*\\extdiff.*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) (windows !)
diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !) diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !)
[1] [1]
Can show diff from working copy: Can show diff from working copy:
$ echo c >> a $ echo c >> a
$ hg falabala -r 'wdir()' -r 1 $ hg falabala --to 1
diffing "*\\extdiff.*\\a" "a.34eed99112ab\\a" (glob) (windows !) diffing "*\\extdiff.*\\a" "a.34eed99112ab\\a" (glob) (windows !)
diffing */extdiff.*/a a.34eed99112ab/a (glob) (no-windows !) diffing */extdiff.*/a a.34eed99112ab/a (glob) (no-windows !)
[1] [1]
$ hg revert a $ hg revert a
$ rm a.orig $ rm a.orig
Specifying an empty revision should abort. Specifying an empty revision should abort.
$ hg ci -m "adding suba file" $ hg ci -m "adding suba file"
$ cd .. $ cd ..
$ echo suba=suba > .hgsub $ echo suba=suba > .hgsub
$ hg add $ hg add
adding .hgsub adding .hgsub
$ hg ci -Sm "adding subrepo" $ hg ci -Sm "adding subrepo"
$ echo > .hgsub $ echo > .hgsub
$ hg ci -m "removing subrepo" $ hg ci -m "removing subrepo"
$ hg falabala -r 4 -r 5 -S $ hg falabala --from 4 --to 5 -S
diffing a.398e36faf9c6 a.5ab95fb166c4 diffing a.398e36faf9c6 a.5ab95fb166c4
[1] [1]
Test --per-file option: Test --per-file option:
$ hg up -q -C 3 $ hg up -q -C 3
$ echo a2 > a $ echo a2 > a
$ echo b2 > b $ echo b2 > b
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extdiff] > [extdiff]
> kdiff3 = echo > kdiff3 = echo
> [merge-tools] > [merge-tools]
> kdiff3.diffargs=--L1 \$plabel1 --L2 \$clabel \$parent \$child > kdiff3.diffargs=--L1 \$plabel1 --L2 \$clabel \$parent \$child
> EOF > EOF
$ hg --debug kdiff3 -r0 | grep '^running' $ hg --debug kdiff3 --from 0 | grep '^running'
running 'echo --L1 "@0" --L2 "" a.8a5febb7f867 a' in * (glob) (windows !) running 'echo --L1 "@0" --L2 "" a.8a5febb7f867 a' in * (glob) (windows !)
running "echo --L1 '@0' --L2 '' a.8a5febb7f867 a" in * (glob) (no-windows !) running "echo --L1 '@0' --L2 '' a.8a5febb7f867 a" in * (glob) (no-windows !)
Test extdiff of multiple files in tmp dir: Test extdiff of multiple files in tmp dir:
$ hg update -C 0 > /dev/null $ hg update -C 0 > /dev/null
$ echo changed > a $ echo changed > a
$ hg init testsymlinks $ hg init testsymlinks
$ cd testsymlinks $ cd testsymlinks
$ echo a > a $ echo a > a
$ hg ci -Am adda $ hg ci -Am adda
adding a adding a
$ echo a >> a $ echo a >> a
$ ln -s missing linka $ ln -s missing linka
$ hg add linka $ hg add linka
$ hg falabala -r 0 --traceback $ hg falabala --from 0 --traceback
diffing testsymlinks.07f494440405 testsymlinks diffing testsymlinks.07f494440405 testsymlinks
[1] [1]
$ cd .. $ cd ..
#endif #endif
Test handling of non-ASCII paths in generated docstrings (issue5301) Test handling of non-ASCII paths in generated docstrings (issue5301)

tests/test-extension.t

"-Npru". "-Npru".
To select a different program, use the -p/--program option. The program To select a different program, use the -p/--program option. The program
will be passed the names of two directories to compare, unless the --per- will be passed the names of two directories to compare, unless the --per-
file option is specified (see below). To pass additional options to the file option is specified (see below). To pass additional options to the
program, use -o/--option. These will be passed before the names of the program, use -o/--option. These will be passed before the names of the
directories or files to compare. directories or files to compare.
When two revision arguments are given, then changes are shown between The --from, --to, and --change options work the same way they do for 'hg
those revisions. If only one revision is specified then that revision is diff'.
compared to the working directory, and, when no revisions are specified,
the working directory files are compared to its parent.
The --per-file option runs the external program repeatedly on each file to 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 diff, instead of once on two directories. By default, this happens one by
one, where the next file diff is open in the external program only once one, where the next file diff is open in the external program only once
the previous external program (for the previous file diff) has exited. If the previous external program (for the previous file diff) has exited. If
the external program has a graphical interface, it can open all the file the external program has a graphical interface, it can open all the file
diffs at once instead of one by one. See 'hg help -e extdiff' for diffs at once instead of one by one. See 'hg help -e extdiff' for
information about how to tell Mercurial that a given program has a information about how to tell Mercurial that a given program has a
graphical interface. graphical interface.
The --confirm option will prompt the user before each invocation of the The --confirm option will prompt the user before each invocation of the
external program. It is ignored if --per-file isn't specified. external program. It is ignored if --per-file isn't specified.
(use 'hg help -e extdiff' to show help for the extdiff extension) (use 'hg help -e extdiff' to show help for the extdiff extension)
options ([+] can be repeated): options ([+] can be repeated):
-p --program CMD comparison program to run -p --program CMD comparison program to run
-o --option OPT [+] pass option to comparison program -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 -c --change REV change made by revision
--per-file compare each file instead of revision snapshots --per-file compare each file instead of revision snapshots
--confirm prompt user before each external program invocation --confirm prompt user before each external program invocation
--patch compare patches for two revisions --patch compare patches for two revisions
-I --include PATTERN [+] include names matching the given patterns -I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns
-S --subrepos recurse into subrepositories -S --subrepos recurse into subrepositories