pestctrl/emacs-config
1
0
Fork 0
mirror of https://github.com/pestctrl/emacs-config.git synced 2026-02-16 16:24:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

More messaging involved in automatic fast forwarding

Browse source
This commit is contained in:
Benson Chu 2022-11-05 10:16:09 -05:00
parent 2329571e6b
commit f903e9feb0
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lisp/git-auto-sync/git-auto-fast-forward-mode.el
View file

@ -56,22 +56,28 @@
(buffer-list)))
(defun gaff/no-pending-gac-commits (folder)
(->> gac--debounce-timers
(hash-table-values)
(mapcar (lambda (timer) (car (timer--args timer))))
(remove-if-not (lambda (buffer) (string-prefix-p folder (buffer-file-name buffer))))
(length)
(zerop)))
(or (->> gac--debounce-timers
(hash-table-values)
(mapcar (lambda (timer) (car (timer--args timer))))
(remove-if-not (lambda (buffer) (string-prefix-p folder (buffer-file-name buffer))))
(length)
(zerop))
(and (message "There are pending gac timers")
nil)))
(defun gaff/no-modified-buffers (folder)
(->> (gaff/get-open-buffers-in folder)
(remove-if-not (lambda (b) (buffer-modified-p b)))
(length)
(zerop)))
(or (->> (gaff/get-open-buffers-in folder)
(remove-if-not (lambda (b) (buffer-modified-p b)))
(length)
(zerop))
(and (message "There are modified buffers")
nil)))
(defun gaff/no-git-changes (folder)
(let ((default-directory folder))
(string-empty-p (shell-command-to-string "git status -suno"))))
(or (string-empty-p (shell-command-to-string "git status -suno"))
(and (message "There are pending git changes")
nil))))
(defun gaff/fetch-fast-forward (repo branches)
;; TODO: work around this hack
@ -103,11 +109,12 @@
(dolist (b buffers)
(with-current-buffer b
(read-only-mode 1)))
(gaff/fetch-fast-forward dir branches))
(gaff/fetch-fast-forward dir branches)
(message "Done fast-forwarding!"))
(dolist (b buffers)
(with-current-buffer b
(read-only-mode -1)
(when (not (userlock--check-content-unchanged (buffer-file-name (current-buffer))))
(when (not (verify-visited-file-modtime (current-buffer)))
(revert-buffer-quick)))))))))
(run-hooks 'gaff/after-merge-hook))