Skip to content

Add extdiff as default diff option #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adamh-oai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add extdiff as default diff option #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions eden/scm/sapling/cmdutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1911,6 +1911,23 @@ def diffordiffstat(
hunksfilterfn=None,
):
"""show diff or diffstat."""
exttool = ui.config("diff", "tool")
if exttool and not stat:
from sapling.ext import extdiff

if not extdiff.cmdtable:
raise error.Abort(_("extdiff plugin not enabled"))

if exttool not in extdiff.cmdtable:
raise error.Abort(_("unknown extdiff tool '%s'") % exttool)

opts = {
"rev": [str(ctx1.rev()), str(ctx2.rev())],
"option": [],
}

extdiff.cmdtable[exttool][0](ui, repo, *list(match.files()), **opts)
return
if fp is None:
if stat:
write = ui.write
Expand Down