[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit a5ca96edcd 02/15: Use cl-union instead of -unio
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/git-commit a5ca96edcd 02/15: Use cl-union instead of -union |
|
Date: |
Mon, 31 Jul 2023 10:00:15 -0400 (EDT) |
branch: elpa/git-commit
commit a5ca96edcd48585c9ea4b97fbe332d5cb83dc34a
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
Use cl-union instead of -union
---
lisp/magit-git.el | 13 +++++++------
lisp/magit-push.el | 7 ++++---
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index f1de0eb351..ab1d4f518e 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -2606,12 +2606,13 @@ and this option only controls what face is used.")
(prompt &optional remote default local-branch require-match)
(let ((choice (magit-completing-read
prompt
- (-union (and local-branch
- (if remote
- (concat remote "/" local-branch)
- (--map (concat it "/" local-branch)
- (magit-list-remotes))))
- (magit-list-remote-branch-names remote t))
+ (cl-union (and local-branch
+ (if remote
+ (concat remote "/" local-branch)
+ (--map (concat it "/" local-branch)
+ (magit-list-remotes))))
+ (magit-list-remote-branch-names remote t)
+ :test #'equal)
nil require-match nil 'magit-revision-history default)))
(if (or remote (string-match "\\`\\([^/]+\\)/\\(.+\\)" choice))
choice
diff --git a/lisp/magit-push.el b/lisp/magit-push.el
index dd3dd8ecb1..3e5538ae8f 100644
--- a/lisp/magit-push.el
+++ b/lisp/magit-push.el
@@ -130,9 +130,10 @@ the upstream."
(not (or (magit-get-upstream-branch branch)
(magit--unnamed-upstream-p remote merge)
(magit--valid-upstream-p remote merge))))
- (let* ((branches (-union (--map (concat it "/" branch)
- (magit-list-remotes))
- (magit-list-remote-branch-names)))
+ (let* ((branches (cl-union (--map (concat it "/" branch)
+ (magit-list-remotes))
+ (magit-list-remote-branch-names)
+ :test #'equal))
(upstream (magit-completing-read
(format "Set upstream of %s and push there" branch)
branches nil nil nil 'magit-revision-history
- [nongnu] elpa/git-commit updated (decd5f40dd -> 95d5be9ac3), ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit 2b82fc2afc 01/15: Use cl-set-difference instead of -difference, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit da23111429 06/15: Use seq-remove instead of -remove-first, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit e8d4674fd7 08/15: Use seq-find instead of -first, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit 3029f64b4a 05/15: Use seq-remove instead of -remove, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit 488ed2ad58 04/15: Use seq-filter instead of -filter, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit a6f9c78374 11/15: Use seq-take and seq-drop instead of -split-at, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit a5ca96edcd 02/15: Use cl-union instead of -union,
ELPA Syncer <=
- [nongnu] elpa/git-commit 82408757b0 03/15: Use seq-map-indexed instead of -map-indexed, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit c9fad8b58e 10/15: Use mapcar and delq instead of -keep, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit bbb0afb516 13/15: No longer use -separate, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit 87afefca87 14/15: No longer use -none-p, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit 95d5be9ac3 15/15: No longer use certain obscure dash functions, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit dcbef90475 09/15: Use seq-some instead of -some, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit 8a8ac32def 12/15: magit--transient-args-and-files: New function, ELPA Syncer, 2023/07/31
- [nongnu] elpa/git-commit ecccdfa3a4 07/15: Use cl-substitute instead of -replace, ELPA Syncer, 2023/07/31