emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(cli): void-variable doom-repo-* errors on 'doom upgrade'

Browse source 
Amend: 6c0b7e1530
This commit is contained in:
Henrik Lissner 2022-06-19 01:10:54 +02:00
parent d5db9076af
commit 2e9997a3d5
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/cli/upgrade.el
View file

@ -63,7 +63,7 @@ following shell commands:
(branch (replace-regexp-in-string (branch (replace-regexp-in-string
"^\\(?:[^/]+/[^/]+/\\)?\\(.+\\)\\(?:~[0-9]+\\)?$" "\\1" "^\\(?:[^/]+/[^/]+/\\)?\\(.+\\)\\(?:~[0-9]+\\)?$" "\\1"
(cdr (doom-call-process "git" "name-rev" "--name-only" "HEAD")))) (cdr (doom-call-process "git" "name-rev" "--name-only" "HEAD"))))
(target-remote (format "%s_%s" doom-repo-remote branch))) (target-remote (format "%s_%s" doom-upgrade-remote branch)))
(unless branch (unless branch
(error (if (file-exists-p! ".git" doom-emacs-dir) (error (if (file-exists-p! ".git" doom-emacs-dir)
"Couldn't find Doom's .git directory. Was Doom cloned properly?" "Couldn't find Doom's .git directory. Was Doom cloned properly?"
@ -81,12 +81,12 @@ following shell commands:
(doom-call-process "git" "reset" "--hard" (format "origin/%s" branch)) (doom-call-process "git" "reset" "--hard" (format "origin/%s" branch))
(doom-call-process "git" "clean" "-ffd"))) (doom-call-process "git" "clean" "-ffd")))
(doom-call-process "git" "remote" "remove" doom-repo-remote) (doom-call-process "git" "remote" "remove" doom-upgrade-remote)
(unwind-protect (unwind-protect
(let (result) (let (result)
(or (zerop (car (doom-call-process "git" "remote" "add" doom-repo-remote doom-repo-url))) (or (zerop (car (doom-call-process "git" "remote" "add" doom-upgrade-remote doom-upgrade-url)))
(error "Failed to add %s to remotes" doom-repo-remote)) (error "Failed to add %s to remotes" doom-upgrade-remote))
(or (zerop (car (setq result (doom-call-process "git" "fetch" "--force" "--tags" doom-repo-remote (format "%s:%s" branch target-remote))))) (or (zerop (car (setq result (doom-call-process "git" "fetch" "--force" "--tags" doom-upgrade-remote (format "%s:%s" branch target-remote)))))
(error "Failed to fetch from upstream")) (error "Failed to fetch from upstream"))
(let ((this-rev (cdr (doom-call-process "git" "rev-parse" "HEAD"))) (let ((this-rev (cdr (doom-call-process "git" "rev-parse" "HEAD")))
@ -107,7 +107,7 @@ following shell commands:
(cdr (doom-call-process "git" "log" "-1" "--format=%cr" target-remote)))) (cdr (doom-call-process "git" "log" "-1" "--format=%cr" target-remote))))
(let ((diff-url (let ((diff-url
(format "%s/compare/%s...%s" (format "%s/compare/%s...%s"
doom-repo-url doom-upgrade-url
this-rev this-rev
new-rev))) new-rev)))
(print! "Link to diff: %s" diff-url) (print! "Link to diff: %s" diff-url)
@ -142,7 +142,7 @@ following shell commands:
t)))))) t))))))
(ignore-errors (ignore-errors
(doom-call-process "git" "branch" "-D" target-remote) (doom-call-process "git" "branch" "-D" target-remote)
(doom-call-process "git" "remote" "remove" doom-repo-remote)))))) (doom-call-process "git" "remote" "remove" doom-upgrade-remote))))))
(defun doom-upgrade--working-tree-dirty-p (dir) (defun doom-upgrade--working-tree-dirty-p (dir)
(cl-destructuring-bind (success . stdout) (cl-destructuring-bind (success . stdout)