| commit | author | age | ||
| 5cb5f7 | 1 | ;ELC |
| C | 2 | ;;; Compiled |
| 3 | ;;; in Emacs version 26.1 | |
| 4 | ;;; with all optimizations. | |
| 5 | ||
| 6 | ;;; This file uses dynamic docstrings, first added in Emacs 19.29. | |
| 7 | ||
| 8 | ;;; This file does not contain utf-8 non-ASCII characters, | |
| 9 | ;;; and so can be loaded in Emacs versions earlier than 23. | |
| 10 | ||
| 11 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
| 12 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
| 13 | ||
| 14 | ||
| 15 | (require 'magit) | |
| 16 | #@54 Popup console for pull commands. | |
| 17 | ||
| 18 | (fn &optional ARG) | |
| 19 | (defalias 'magit-pull-popup #[256 "\300\301\302#\207" [magit-invoke-popup magit-pull-popup nil] 5 (#$ . 425) "P"]) | |
| 20 | (defvar magit-pull-popup (list :variable 'magit-pull-arguments :man-page "git-pull" :variables '("Configure" (114 "branch.%s.rebase" magit-cycle-branch*rebase magit-pull-format-branch*rebase) (67 "variables..." magit-branch-config-popup)) :actions '((lambda nil (--if-let (magit-get-current-branch) (concat (propertize "Pull into " 'face 'magit-popup-heading) (propertize it 'face 'magit-branch-local) (propertize " from" 'face 'magit-popup-heading)) (propertize "Pull from" 'face 'magit-popup-heading))) (112 magit-get-push-branch magit-pull-from-pushremote) (117 magit-get-upstream-branch magit-pull-from-upstream) (101 "elsewhere" magit-pull-branch)) :default-action 'magit-pull :max-action-columns 1)) | |
| 21 | (byte-code "\300\301!\210\302\303\304\305\306DD\307\310\311\312\313&\207" [magit-define-popup-keys-deferred magit-pull-popup custom-declare-variable magit-pull-arguments funcall function #[0 "\301\302\"\207" [magit-pull-popup plist-get :default-arguments] 3] "" :group magit-git-arguments :type (repeat (string :tag "Argument"))] 8) | |
| 22 | (defalias 'magit-pull-arguments #[0 "\303=\203 \207\n\207" [magit-current-popup magit-current-popup-args magit-pull-arguments magit-pull-popup] 2]) | |
| 23 | (put 'magit-pull-arguments 'definition-name 'magit-pull-popup) | |
| 24 | #@1049 Popup console for pull and fetch commands. | |
| 25 | ||
| 26 | This popup is intended as a replacement for the separate popups | |
| 27 | `magit-pull-popup' and `magit-fetch-popup'. To use it, add this | |
| 28 | to your init file: | |
| 29 | ||
| 30 | (with-eval-after-load \='magit-remote | |
| 31 | (define-key magit-mode-map "f" \='magit-pull-and-fetch-popup) | |
| 32 | (define-key magit-mode-map "F" nil)) | |
| 33 | ||
| 34 | The combined popup does not offer all commands and arguments | |
| 35 | available from the individual popups. Instead of the argument | |
| 36 | `--prune' and the command `magit-fetch-all' it uses two commands | |
| 37 | `magit-fetch-prune' and `magit-fetch-no-prune'. And the commands | |
| 38 | `magit-fetch-from-pushremote' and `magit-fetch-from-upstream' are | |
| 39 | missing. To add them use something like: | |
| 40 | ||
| 41 | (with-eval-after-load \='magit-remote | |
| 42 | (magit-define-popup-action \='magit-pull-and-fetch-popup ?U | |
| 43 | \='magit-get-upstream-branch | |
| 44 | \='magit-fetch-from-upstream-remote ?F) | |
| 45 | (magit-define-popup-action \='magit-pull-and-fetch-popup ?P | |
| 46 | \='magit-get-push-branch | |
| 47 | \='magit-fetch-from-push-remote ?F)) | |
| 48 | ||
| 49 | (fn &optional ARG) | |
| 50 | (defalias 'magit-pull-and-fetch-popup #[256 "\300\301\302#\207" [magit-invoke-popup magit-pull-and-fetch-popup nil] 5 (#$ . 1857) "P"]) | |
| 51 | (defvar magit-pull-and-fetch-popup (list :variable 'magit-pull-and-fetch-arguments :man-page "git-pull" :variables '("Configure" (114 "branch.%s.rebase" magit-cycle-branch*rebase magit-pull-format-branch*rebase) (67 "variables..." magit-branch-config-popup)) :actions '((lambda nil (--if-let (magit-get-current-branch) (concat (propertize "Pull into " 'face 'magit-popup-heading) (propertize it 'face 'magit-branch-local) (propertize " from" 'face 'magit-popup-heading)) (propertize "Pull from" 'face 'magit-popup-heading))) (112 magit-get-push-branch magit-pull-from-pushremote) (117 magit-get-upstream-branch magit-pull-from-upstream) (101 "elsewhere" magit-pull-branch) "Fetch from" (102 "remotes" magit-fetch-all-no-prune) (70 "remotes and prune" magit-fetch-all-prune) "Fetch" (111 "another branch" magit-fetch-branch) (115 "explicit refspec" magit-fetch-refspec) (109 "submodules" magit-fetch-modules)) :default-action 'magit-fetch :max-action-columns 1)) | |
| 52 | (byte-code "\300\301!\210\302\303\304\305\306DD\307\310\311\312\313&\207" [magit-define-popup-keys-deferred magit-pull-and-fetch-popup custom-declare-variable magit-pull-and-fetch-arguments funcall function #[0 "\301\302\"\207" [magit-pull-and-fetch-popup plist-get :default-arguments] 3] "" :group magit-git-arguments :type (repeat (string :tag "Argument"))] 8) | |
| 53 | (defalias 'magit-pull-and-fetch-arguments #[0 "\303=\203 \207\n\207" [magit-current-popup magit-current-popup-args magit-pull-and-fetch-arguments magit-pull-and-fetch-popup] 2]) | |
| 54 | (put 'magit-pull-and-fetch-arguments 'definition-name 'magit-pull-and-fetch-popup) | |
| 55 | (defalias 'magit-pull-format-branch*rebase #[0 "\300\301\302\303 \206 \304\"\305\306\307$\207" [magit--format-popup-variable:choices format "branch.%s.rebase" magit-get-current-branch "<name>" ("true" "false") "false" "pull.rebase"] 5]) | |
| 56 | #@20 | |
| 57 | ||
| 58 | (fn SOURCE ARGS) | |
| 59 | (defalias 'magit-git-pull #[514 "\300\301!\210\302!\211@A\211\303\304$\266\202\207" [run-hooks magit-credential-hook magit-split-branch-name magit-run-git-with-editor "pull"] 12 (#$ . 4877)]) | |
| 60 | #@61 Pull from the push-remote of the current branch. | |
| 61 | ||
| 62 | (fn ARGS) | |
| 63 | (defalias 'magit-pull-from-pushremote #[257 "\300 \211\203 \301\"\202 \302 \211\203 \303\304\"\202 \303\305!\262\207" [magit-get-push-branch magit-git-pull magit-get-current-branch user-error "No push-remote is configured for %s" "No branch is checked out"] 6 (#$ . 5101) (byte-code "\300 C\207" [magit-pull-arguments] 1)]) | |
| 64 | #@58 Pull from the upstream of the current branch. | |
| 65 | ||
| 66 | (fn ARGS) | |
| 67 | (defalias 'magit-pull-from-upstream #[257 "\300 \211\203 \301\302!\210\303\304\305!@#\202' \306 \211\203\" \307\310\"\202% \307\311!\262\207" [magit-get-upstream-branch run-hooks magit-credential-hook magit-run-git-with-editor "pull" magit-split-branch-name magit-get-current-branch user-error "No upstream is configured for %s" "No branch is checked out"] 7 (#$ . 5499) (byte-code "\300 C\207" [magit-pull-arguments] 1)]) | |
| 68 | #@62 Pull from a branch read in the minibuffer. | |
| 69 | ||
| 70 | (fn SOURCE ARGS) | |
| 71 | (defalias 'magit-pull-branch #[514 "\300\"\207" [magit-git-pull] 5 (#$ . 5990) (byte-code "\300\301\302\211\211\303%\304 D\207" [magit-read-remote-branch "Pull" nil t magit-pull-arguments] 6)]) | |
| 72 | (provide 'magit-pull) | |
