Skip to content

shows diff in terminal #8377

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

Draft
agzam wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

shows diff in terminal #8377

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: 12 additions & 5 deletions lisp/cli/upgrade.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,18 @@ libraries. It is the equivalent of the following shell commands:
this-rev
new-rev)))
(print! "Link to diff: %s" diff-url)
(when (and (not auto-accept-p)
(y-or-n-p "View the comparison diff in your browser?"))
(print! (item "Opened github in your browser."))
(browse-url diff-url)))

(if-let* ((gh (executable-find "gh"))
(cmd (format "%s api repos/doomemacs/doomemacs/compare/%s...%s"
gh this-rev new-rev)))
(progn
(when-let* ((delta (executable-find "delta")))
(setq cmd (format "%s | %s --paging=never" cmd delta)))
(print! "Comparison diff: %s" diff-url)
(sh! cmd))
(when (and (not auto-accept-p)
(y-or-n-p "View the comparison diff in your browser?"))
(print! (item "Opened github in your browser."))
(browse-url diff-url))))
(if (not (or auto-accept-p
(y-or-n-p "Proceed with upgrade?")))
(ignore (print! (error "Aborted")))
Expand Down