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 |
(byte-code "\300\301!\210\302\303\304\305\306\307%\210\302\310\311\305\306\307%\210\302\312\313\305\306\307%\210\302\314\315\305\306\307%\210\302\316\317\305\306\307%\210\302\320\321\305\306\307%\210\302\322\323\305\306\307%\210\302\324\325\305\306\307%\207" [require magit custom-declare-face magit-sequence-pick ((t :inherit default)) "Face used in sequence sections." :group magit-faces magit-sequence-stop ((((class color) (background light)) :foreground "DarkOliveGreen4") (((class color) (background dark)) :foreground "DarkSeaGreen2")) magit-sequence-part ((((class color) (background light)) :foreground "Goldenrod4") (((class color) (background dark)) :foreground "LightGoldenrod2")) magit-sequence-head ((((class color) (background light)) :foreground "SkyBlue4") (((class color) (background dark)) :foreground "LightSkyBlue1")) magit-sequence-drop ((((class color) (background light)) :foreground "IndianRed") (((class color) (background dark)) :foreground "IndianRed")) magit-sequence-done ((t :inherit magit-hash)) magit-sequence-onto ((t :inherit magit-sequence-done)) magit-sequence-exec ((t :inherit magit-hash))] 6) |
|
16 |
#@52 Resume the current cherry-pick or revert sequence. |
|
17 |
(defalias 'magit-sequencer-continue #[0 "\300 \203 \301\302!\203 \303\304!\207\305\306 \203 \307\202 \310\311\"\207\303\312!\207" [magit-sequencer-in-progress-p magit-anything-unstaged-p t user-error "Cannot continue due to unstaged changes" magit-run-git-sequencer magit-revert-in-progress-p "revert" "cherry-pick" "--continue" "No cherry-pick or revert in progress"] 3 (#$ . 1541) nil]) |
|
18 |
#@69 Skip the stopped at commit during a cherry-pick or revert sequence. |
|
19 |
(defalias 'magit-sequencer-skip #[0 "\300 \203
\301\302\303\"\210\304 \207\305\306!\207" [magit-sequencer-in-progress-p magit-call-git "reset" "--hard" magit-sequencer-continue user-error "No cherry-pick or revert in progress"] 3 (#$ . 1991) nil]) |
|
20 |
#@110 Abort the current cherry-pick or revert sequence. |
|
21 |
This discards all changes made since the sequence started. |
|
22 |
(defalias 'magit-sequencer-abort #[0 "\300 \203 \301\302 \203 \303\202 \304\305\"\207\306\307!\207" [magit-sequencer-in-progress-p magit-run-git-sequencer magit-revert-in-progress-p "revert" "cherry-pick" "--abort" user-error "No cherry-pick or revert in progress"] 3 (#$ . 2315) nil]) |
|
23 |
(defalias 'magit-sequencer-in-progress-p #[0 "\300 \206 \301 \207" [magit-cherry-pick-in-progress-p magit-revert-in-progress-p] 1]) |
|
24 |
#@22 The Perl executable. |
|
25 |
(defvar magit-perl-executable "perl" (#$ . 2852)) |
|
26 |
#@61 Popup console for cherry-pick commands. |
|
27 |
|
|
28 |
(fn &optional ARG) |
|
29 |
(defalias 'magit-cherry-pick-popup #[256 "\300\301\302#\207" [magit-invoke-popup magit-cherry-pick-popup nil] 5 (#$ . 2929) "P"]) |
|
30 |
(defvar magit-cherry-pick-popup (list :variable 'magit-cherry-pick-arguments :man-page "git-cherry-pick" :switches '((115 "Add Signed-off-by lines" "--signoff") (101 "Edit commit messages" "--edit") (120 "Reference cherry in commit message" "-x") (70 "Attempt fast-forward" "--ff")) :options '((115 "Strategy" "--strategy=") (109 "Replay merge relative to parent" "--mainline=")) :actions '("Apply here" (65 "Pick" magit-cherry-copy) (97 "Apply" magit-cherry-apply) (104 "Harvest" magit-cherry-harvest) "Apply elsewhere" (100 "Donate" magit-cherry-donate) (110 "Spinout" magit-cherry-spinout) (115 "Spinoff" magit-cherry-spinoff)) :sequence-actions '((65 "Continue" magit-sequencer-continue) (115 "Skip" magit-sequencer-skip) (97 "Abort" magit-sequencer-abort)) :sequence-predicate 'magit-sequencer-in-progress-p :default-arguments '("--ff"))) |
|
31 |
(byte-code "\300\301!\210\302\303\304\305\306DD\307\310\311\312\313&\207" [magit-define-popup-keys-deferred magit-cherry-pick-popup custom-declare-variable magit-cherry-pick-arguments funcall function #[0 "\301\302\"\207" [magit-cherry-pick-popup plist-get :default-arguments] 3] "" :group magit-git-arguments :type (repeat (string :tag "Argument"))] 8) |
|
32 |
(defalias 'magit-cherry-pick-arguments #[0 "\303=\203 \207\n\207" [magit-current-popup magit-current-popup-args magit-cherry-pick-arguments magit-cherry-pick-popup] 2]) |
|
33 |
(put 'magit-cherry-pick-arguments 'definition-name 'magit-cherry-pick-popup) |
|
34 |
#@15 |
|
35 |
|
|
36 |
(fn PROMPT) |
|
37 |
(defalias 'magit-cherry-pick-read-args #[257 "\300\301!\237\206\n \302!\303 D\207" [magit-region-values commit magit-read-other-branch-or-commit magit-cherry-pick-arguments] 3 (#$ . 4575)]) |
|
38 |
#@21 |
|
39 |
|
|
40 |
(fn VERB AWAY FN) |
|
41 |
(defalias 'magit--cherry-move-read-args #[771 "\300\301!\237\206 \203 \302\202 \303\304\305\306!\"!C\307 \211\204% \310\311\"\210\312@\"\313D\211:\203\201 \211@\211\204\\ A\211:\203X \211@\211\314=\203W A\211\204V \310
\315#\210\210\210\210\202\200 \211\314=\203\200 A\211:\203 \211@\211\204~ A\211\204} \310
\316#\210\210\210\210\210\266\317!\320 C\"B\207" [magit-region-values commit magit-read-branch-or-commit magit-read-other-branch-or-commit format "%s cherry" capitalize magit-get-current-branch user-error "Cannot %s cherries while HEAD is detached" magit-rev-ancestor-p "Cannot %s cherries that %s reachable from HEAD" t "are" "are not" append magit-cherry-pick-arguments] 16 (#$ . 4786)]) |
|
42 |
(byte-code "\300\301\302\303#\300\207" [function-put magit--cherry-move-read-args lisp-indent-function defun] 4) |
|
43 |
#@13 |
|
44 |
|
|
45 |
(fn VERB) |
|
46 |
(defalias 'magit--cherry-spinoff-read-args #[257 "\300\301\302#\207" [magit--cherry-move-read-args t #[257 "\300\301\302\303\"!!\207" [butlast magit-branch-read-args format "Create branch from %s cherries"] 6 "\n\n(fn COMMITS)"]] 5 (#$ . 5651)]) |
|
47 |
#@227 Copy COMMITS from another branch onto the current branch. |
|
48 |
Prompt for a commit, defaulting to the commit at point. If |
|
49 |
the region selects multiple commits, then pick all of them, |
|
50 |
without prompting. |
|
51 |
|
|
52 |
(fn COMMITS &optional ARGS) |
|
53 |
(defalias 'magit-cherry-copy #[513 "\300\"\207" [magit--cherry-pick] 5 (#$ . 5918) (magit-cherry-pick-read-args "Cherry-pick")]) |
|
54 |
#@223 Apply the changes in COMMITS but do not commit them. |
|
55 |
Prompt for a commit, defaulting to the commit at point. If |
|
56 |
the region selects multiple commits, then apply all of them, |
|
57 |
without prompting. |
|
58 |
|
|
59 |
(fn COMMITS &optional ARGS) |
|
60 |
(defalias 'magit-cherry-apply #[513 "\300\301\302\303\"B\"\207" [magit--cherry-pick "--no-commit" remove "--ff"] 8 (#$ . 6282) (magit-cherry-pick-read-args "Apply changes from commit")]) |
|
61 |
#@239 Move COMMITS from another BRANCH onto the current branch. |
|
62 |
Remove the COMMITS from BRANCH and stay on the current branch. |
|
63 |
If a conflict occurs, then you have to fix that and finish the |
|
64 |
process manually. |
|
65 |
|
|
66 |
(fn COMMITS BRANCH &optional ARGS) |
|
67 |
(defalias 'magit-cherry-harvest #[770 "\300\301 \302\303&\207" [magit--cherry-move magit-get-current-branch nil t] 10 (#$ . 6700) (magit--cherry-move-read-args "harvest" nil #[257 "\300@!\211G\211\301\267\202 \302\202 @\202 \303\304\305G\"\302\306$\262\262C\207" [magit-list-containing-branches #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (0 12 1 16)) nil magit-completing-read format "Remove %s cherries from branch" t] 8 "\n\n(fn COMMITS)"])]) |
|
68 |
#@249 Move COMMITS from the current branch onto another existing BRANCH. |
|
69 |
Remove COMMITS from the current branch and stay on that branch. |
|
70 |
If a conflict occurs, then you have to fix that and finish the |
|
71 |
process manually. |
|
72 |
|
|
73 |
(fn COMMITS BRANCH &optional ARGS) |
|
74 |
(defalias 'magit-cherry-donate #[770 "\300\301 $\207" [magit--cherry-move magit-get-current-branch] 8 (#$ . 7445) (magit--cherry-move-read-args "donate" t #[257 "\300\301\302G\"!C\207" [magit-read-other-branch format "Move %s cherries to branch"] 5 "\n\n(fn COMMITS)"])]) |
|
75 |
#@250 Move COMMITS from the current branch onto a new BRANCH. |
|
76 |
Remove COMMITS from the current branch and stay on that branch. |
|
77 |
If a conflict occurs, then you have to fix that and finish the |
|
78 |
process manually. |
|
79 |
|
|
80 |
(fn COMMITS BRANCH START-POINT &optional ARGS) |
|
81 |
(defalias 'magit-cherry-spinout #[1027 "\300\301 %\207" [magit--cherry-move magit-get-current-branch] 10 (#$ . 7976) (magit--cherry-spinoff-read-args "spinout")]) |
|
82 |
#@246 Move COMMITS from the current branch onto a new BRANCH. |
|
83 |
Remove COMMITS from the current branch and checkout BRANCH. |
|
84 |
If a conflict occurs, then you have to fix that and finish |
|
85 |
the process manually. |
|
86 |
|
|
87 |
(fn COMMITS BRANCH START-POINT &optional ARGS) |
|
88 |
(defalias 'magit-cherry-spinoff #[1027 "\300\301 \302&\207" [magit--cherry-move magit-get-current-branch t] 11 (#$ . 8400) (magit--cherry-spinoff-read-args "spinoff")]) |
|
89 |
#@64 |
|
90 |
|
|
91 |
(fn COMMITS SRC DST ARGS &optional START-POINT CHECKOUT-DST) |
|
92 |
(defalias 'magit--cherry-move #[1540 "\302 \303!\204\" |