This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9623

extdiff: fix crash when showing diff from wdir()
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdfe2760db2a6: extdiff: fix crash when showing diff from wdir()

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:58 AM
This revision is now accepted and ready to land.Dec 17 2020, 5:58 AM
martinvonz added a commit: rHGdfe2760db2a6: extdiff: fix crash when showing diff from wdir().Dec 17 2020, 6:56 AM
Closed by commit rHGdfe2760db2a6: extdiff: fix crash when showing diff from wdir() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
mharbison72 added a subscriber: mharbison72.Dec 17 2020, 11:55 AM

Is this the fix for https://bz.mercurial-scm.org/show_bug.cgi?id=6374? (I think so, just want to confirm)

martinvonz added a comment.Dec 17 2020, 11:56 AM
In D9623#144927, @mharbison72 wrote:

Is this the fix for https://bz.mercurial-scm.org/show_bug.cgi?id=6374? (I think so, just want to confirm)

Yep, that's correct. I had no idea anyone had noticed it. I clearly should have checked. Thanks for finding it :) I'll close that bug.

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (2 lines)
Mtests/test-extdiff.t (9 lines)

Diff 24329

hgext/extdiff.py

# Always make a copy of ctx1a (and ctx1b, if applicable) # Always make a copy of ctx1a (and ctx1b, if applicable)
# dir1a should contain files which are: # dir1a should contain files which are:
# * modified or removed from ctx1a to ctx2 # * modified or removed from ctx1a to ctx2
# * modified or added from ctx1b to ctx2 # * modified or added from ctx1b to ctx2
# (except file added from ctx1a to ctx2 as they were not present in # (except file added from ctx1a to ctx2 as they were not present in
# ctx1a) # ctx1a)
dir1a_files = mod_a | rem_a | ((mod_b | add_b) - add_a) dir1a_files = mod_a | rem_a | ((mod_b | add_b) - add_a)
dir1a = snapshot(ui, repo, dir1a_files, ctx1a.node(), tmproot, subrepos)[0] dir1a = snapshot(ui, repo, dir1a_files, ctx1a.node(), tmproot, subrepos)[0]
rev1a = b'@%d' % ctx1a.rev() rev1a = b'' if ctx1a.rev() is None else b'@%d' % ctx1a.rev()
if do3way: if do3way:
# file calculation criteria same as dir1a # file calculation criteria same as dir1a
dir1b_files = mod_b | rem_b | ((mod_a | add_a) - add_b) dir1b_files = mod_b | rem_b | ((mod_a | add_a) - add_b)
dir1b = snapshot( dir1b = snapshot(
ui, repo, dir1b_files, ctx1b.node(), tmproot, subrepos ui, repo, dir1b_files, ctx1b.node(), tmproot, subrepos
)[0] )[0]
rev1b = b'@%d' % ctx1b.rev() rev1b = b'@%d' % ctx1b.rev()
else: else:

tests/test-extdiff.t

Should diff cloned files directly: Should diff cloned files directly:
$ hg falabala -r 0:1 $ hg falabala -r 0: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:
$ echo c >> a
$ hg falabala -r 'wdir()' -r 1
diffing "*\\extdiff.*\\a" "a.34eed99112ab\\a" (glob) (windows !)
diffing */extdiff.*/a a.34eed99112ab/a (glob) (no-windows !)
[1]
$ hg revert a
$ rm a.orig
Specifying an empty revision should abort. Specifying an empty revision should abort.
$ hg extdiff -p diff --patch --rev 'ancestor()' --rev 1 $ hg extdiff -p diff --patch --rev 'ancestor()' --rev 1
abort: empty revision on one side of range abort: empty revision on one side of range
[255] [255]
Test diff during merge: Test diff during merge: