branch: elpa/magit
commit f302af25b0ca7320150f7b0eacfa9ce5c531a5b3
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-branch{,-or-commit}-at-point: Replace forge--pullreq-branch
That function was removed from Forge a long time ago, in [1: 787ab6c9].
1: 2020-12-29 787ab6c903ae8678b053164d67378824b0e73267
forge--branch-pullreq-{active,select}: New functions
---
lisp/magit-git.el | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 8ce1c9d8c0..530ec8ff4e 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -1659,9 +1659,8 @@ to, or to some other symbolic-ref that points to the same
ref."
(branch (oref it value))
(commit (or (magit--painted-branch-at-point)
(magit-name-branch (oref it value))))
- (pullreq (and (fboundp 'forge--pullreq-branch)
- (magit-branch-p
- (forge--pullreq-branch (oref it value)))))
+ (pullreq (and (fboundp 'forge--pullreq-branch-active)
+ (forge--pullreq-branch-active (oref it value))))
(related-refs (magit--painted-branch-at-point))
((unpulled unpushed)
(magit-ref-abbrev
@@ -1715,11 +1714,10 @@ to, or to some other symbolic-ref that points to the
same ref."
(let ((rev (oref it value)))
(or (magit-name-branch rev) rev))))
(tag (magit-ref-maybe-qualify (oref it value) "tags/"))
- (pullreq (or (and (fboundp 'forge--pullreq-branch)
- (magit-branch-p
- (forge--pullreq-branch (oref it value))))
- (magit-ref-p (format "refs/pullreqs/%s"
- (oref (oref it value) number)))))
+ (pullreq (or (and (fboundp 'forge--pullreq-branch-active)
+ (forge--pullreq-branch-active (oref it value)))
+ (and (fboundp 'forge--pullreq-ref)
+ (forge--pullreq-ref (oref it value)))))
((unpulled unpushed)
(magit-ref-abbrev
(replace-regexp-in-string "\\.\\.\\.?" "" (oref it value)))))
