Skip to content
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

Be more explicit about waiting for the fetch process #73

Merged
merged 3 commits into from
Jan 10, 2025
Merged

Be more explicit about waiting for the fetch process #73

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
157935a
Use with-temp-message in some patchset functions
snogge Feb 26, 2024
ce9f2f1
Let magit-gerrit-process-wait wait on any process
snogge Feb 26, 2024
da82d36
Wait on fetch in magit-gerrit-(download|view)-patchset*
snogge Feb 26, 2024
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
31 changes: 17 additions & 14 deletions magit-gerrit.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,12 @@ message and fetch the review data from gerrit."
(car (magit-gerrit--ssh-query (magit-gerrit-get-project)
change-id)))))

(defsubst magit-gerrit-process-wait ()
(while (and magit-this-process
(eq (process-status magit-this-process) 'run))
(defsubst magit-gerrit-process-wait (&optional process)
"Wait for PROCESS to finish.
If PROCESS is nil, wait for `magit-this-process'."
(setq process (or process magit-this-process))
(while (and process
(eq (process-status process) 'run))
(sleep-for 0.005)))

(defun magit-gerrit-view-patchset-diff ()
Expand All @@ -322,11 +325,11 @@ message and fetch the review data from gerrit."
(when jobj
(let ((ref (cdr (assoc 'ref (assoc 'currentPatchSet jobj))))
(dir default-directory))
(magit-git-fetch magit-gerrit-remote ref)
(message (format "Waiting a git fetch from %s to complete..."
magit-gerrit-remote))
(magit-gerrit-process-wait)
(message (format "Generating Gerrit Patchset for refs %s dir %s" ref dir))
(with-temp-message (format "Waiting a git fetch from %s to complete..."
magit-gerrit-remote)
(magit-gerrit-process-wait
(magit-git-fetch magit-gerrit-remote ref)))
(message "Generating Gerrit Patchset for refs %s dir %s" ref dir)
(apply #'magit-diff-setup-buffer
"FETCH_HEAD~1..FETCH_HEAD" nil
(magit-diff-arguments))))))
Expand All @@ -341,12 +344,12 @@ message and fetch the review data from gerrit."
(branch (format "review/%s/%s"
(cdr (assoc 'username (assoc 'owner jobj)))
(cdr (or (assoc 'topic jobj) (assoc 'number jobj))))))
(magit-git-fetch magit-gerrit-remote ref)
(message (format "Waiting a git fetch from %s to complete..."
magit-gerrit-remote))
(magit-gerrit-process-wait)
(message (format "Checking out refs %s to %s in %s" ref branch dir))
(magit-gerrit-create-branch-force branch "FETCH_HEAD")))))
(with-temp-message (format "Waiting a git fetch from %s to complete..."
magit-gerrit-remote)
(magit-gerrit-process-wait
(magit-git-fetch magit-gerrit-remote ref)))
(with-temp-message (format "Checking out refs %s to %s in %s" ref branch dir)
(magit-gerrit-create-branch-force branch "FETCH_HEAD"))))))

(defun magit-gerrit-browse-review ()
"Browse the Gerrit Review with a browser."
Expand Down