forge--fetch-{issues,pullreqs}(gitlab): Cosmetics

Author: tarsius

lisp/forge-gitlab.el

@@ -131,23 +131,20 @@
   (let ((cb (let (val cur cnt pos)
               (lambda (cb &optional v)
                 (cond
-                  ((not pos)
-                   (if (setq cur (setq val v))
-                       (progn
-                         (setq pos 1)
-                         (setq cnt (length val))
-                         (forge--msg nil nil nil "Pulling issue %s/%s" pos cnt)
-                         (forge--fetch-issue-posts repo cur cb))
-                     (forge--msg repo t t "Pulling REPO issues")
-                     (funcall callback callback (cons 'issues val))))
+                  ((and (not pos) v)
+                   (setq val v)
+                   (setq cur v)
+                   (setq pos 1)
+                   (setq cnt (length val))
+                   (forge--msg nil nil nil "Pulling issue %s/%s" pos cnt)
+                   (forge--fetch-issue-posts repo cur cb))
+                  ((setq cur (cdr cur))
+                   (cl-incf pos)
+                   (forge--msg nil nil nil "Pulling issue %s/%s" pos cnt)
+                   (forge--fetch-issue-posts repo cur cb))
                   (t
-                   (if (setq cur (cdr cur))
-                       (progn
-                         (cl-incf pos)
-                         (forge--msg nil nil nil "Pulling issue %s/%s" pos cnt)
-                         (forge--fetch-issue-posts repo cur cb))
-                     (forge--msg repo t t "Pulling REPO issues")
-                     (funcall callback callback (cons 'issues val)))))))))
+                   (forge--msg repo t t "Pulling REPO issues")
+                   (funcall callback callback (cons 'issues val))))))))
     (forge--msg repo t nil "Pulling REPO issues")
     (forge--glab-get repo "/projects/:project/issues"
       `((per_page . 100)
@@ -226,27 +223,27 @@
   (let ((cb (let (val cur cnt pos)
               (lambda (cb &optional v)
                 (cond
+                  ((and (not pos) v)
+                   (setq val v)
+                   (setq cur v)
+                   (setq pos 1)
+                   (setq cnt (length val))
+                   (forge--msg nil nil nil "Pulling pullreq %s/%s" pos cnt)
+                   (forge--fetch-pullreq-posts repo cur cb))
                   ((not pos)
-                   (if (setq cur (setq val v))
-                       (progn
-                         (setq pos 1)
-                         (setq cnt (length val))
-                         (forge--msg nil nil nil "Pulling pullreq %s/%s" pos cnt)
-                         (forge--fetch-pullreq-posts repo cur cb))
-                     (forge--msg repo t t "Pulling REPO pullreqs")
-                     (funcall callback callback (cons 'pullreqs val))))
+                   (forge--msg repo t t "Pulling REPO pullreqs")
+                   (funcall callback callback (cons 'pullreqs val)))
                   ((not (assq 'source_project (car cur)))
                    (forge--fetch-pullreq-source-repo repo cur cb))
                   ((not (assq 'target_project (car cur)))
                    (forge--fetch-pullreq-target-repo repo cur cb))
+                  ((setq cur (cdr cur))
+                   (cl-incf pos)
+                   (forge--msg nil nil nil "Pulling pullreq %s/%s" pos cnt)
+                   (forge--fetch-pullreq-posts repo cur cb))
                   (t
-                   (if (setq cur (cdr cur))
-                       (progn
-                         (cl-incf pos)
-                         (forge--msg nil nil nil "Pulling pullreq %s/%s" pos cnt)
-                         (forge--fetch-pullreq-posts repo cur cb))
-                     (forge--msg repo t t "Pulling REPO pullreqs")
-                     (funcall callback callback (cons 'pullreqs val)))))))))
+                   (forge--msg repo t t "Pulling REPO pullreqs")
+                   (funcall callback callback (cons 'pullreqs val))))))))
     (forge--msg repo t nil "Pulling REPO pullreqs")
     (forge--glab-get repo "/projects/:project/merge_requests"
       `((per_page . 100)