| 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\300\302!\210\300\303!\210\304\305\306\307\310DD\311\312\313\314\315\316\317& \210\304\320\306\307\321DD\322\312\323\314\324\316\317& \210\304\325\306\307\326DD\327\312\330\314\324\316\317& \210\304\331\306\307\332DD\333\312\334\314\324\316\335& \207" [require magit-core magit-diff magit-wip custom-declare-variable magit-delete-by-moving-to-trash funcall function #[0 "\300\207" [t] 1] "Whether Magit uses the system's trash can.\n\nYou should absolutely not disable this and also remove `discard'\nfrom `magit-no-confirm'. You shouldn't do that even if you have\nall of the Magit-Wip modes enabled, because those modes do not\ntrack any files that are not tracked in the proper branch." :package-version (magit . "2.1.0") :group magit-essentials :type boolean magit-unstage-committed #[0 "\300\207" [t] 1] "Whether unstaging a committed change reverts it instead.\n\nA committed change cannot be unstaged, because staging and\nunstaging are actions that are concerned with the differences\nbetween the index and the working tree, not with committed\nchanges.\n\nIf this option is non-nil (the default), then typing \"u\"\n(`magit-unstage') on a committed change, causes it to be\nreversed in the index but not the working tree. For more\ninformation see command `magit-reverse-in-index'." (magit . "2.4.1") magit-commands magit-reverse-atomically #[0 "\300\207" [nil] 1] "Whether to reverse changes atomically.\n\nIf some changes can be reversed while others cannot, then nothing\nis reversed if the value of this option is non-nil. But when it\nis nil, then the changes that can be reversed are reversed and\nfor the other changes diff files are created that contain the\nrejected reversals." (magit . "2.7.0") magit-post-stage-hook #[0 "\300\207" [nil] 1] "Hook run after staging changes.\nThis hook is run by `magit-refresh' if `this-command'\nis a member of `magit-post-stage-hook-commands'." (magit . "2.90.0") hook] 10) | |
| 16 | (defvar magit-post-stage-hook-commands '(magit-stage magit-stage-file magit-stage-modified)) | |
| 17 | (byte-code "\300\301\302\303\304DD\305\306\307\310\311\312\313& \207" [custom-declare-variable magit-post-unstage-hook funcall function #[0 "\300\207" [nil] 1] "Hook run after unstaging changes.\nThis hook is run by `magit-refresh' if `this-command'\nis a member of `magit-post-unstage-hook-commands'." :package-version (magit . "2.90.0") :group magit-commands :type hook] 10) | |
| 18 | (defvar magit-post-unstage-hook-commands '(magit-unstage magit-unstage-file magit-unstage-all)) | |
| 19 | #@179 Apply the change at point to the working tree. | |
| 20 | With a prefix argument fallback to a 3-way merge. Doing | |
| 21 | so causes the change to be applied to the index as well. | |
| 22 | ||
| 23 | (fn &rest ARGS) | |
| 24 | (defalias 'magit-apply #[128 "\300 \211\205\215\301 \302 D\211:\205\213\211@\211\303>\2030 A\211:\205+ \211A\211?\205) \304\305!\262\262\202\211\211\306=\203\323 A\211:\205\316 \211@\211\307>\203S A\211?\205N \310 \262\202\314 \211\311=\203k A\211?\205f \312\"\262\202\314 \211\313=\203\203 A\211?\205~ \314\"\262\202\314 \211\315=\203\233 A\211?\205\226 \316\"\262\202\314 \211\317=\203\263 A\211?\205\256 \320\"\262\202\314 \211\321=\203\313 A\211?\205\306 \322\"\262\202\314 \323\262\262\202\211A\211:\205\207\211@\211\311=\203\364 A\211?\205\357 \312\"\262\202\205\211\313=\203\fA\211?\205\314\"\262\202\205\211\315=\203$A\211?\205 \316\"\262\202\205\324=\203T\211\325\267\202PA\211?\2059\326 \262\202\205A\211?\205K\322\"\262\202\205\323\202\205\211\317=\203lA\211?\205g\320\"\262\202\205\211\321=\203\204A\211?\205\322\"\262\202\205\323\262\262\262\262\207" [magit-apply--get-selection magit-diff-type magit-diff-scope (staged unstaged) user-error "Change is already in the working tree" untracked (files file) magit-am-popup region magit-apply-region hunk magit-apply-hunk hunks magit-apply-hunks file magit-apply-diff files magit-apply-diffs nil rebase-sequence #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (file 304 files 318)) magit-patch-apply-popup] 10 (#$ . 2932) (byte-code "\205 \301C\207" [current-prefix-arg "--3way"] 1)]) | |
| 25 | #@16 | |
| 26 | ||
| 27 | (fn SECTION) | |
| 28 | (defalias 'magit-apply--section-content #[257 "\300\301!\203 \302\303\"\202 \302\304\"\302\305\"\"\207" [buffer-substring-no-properties magit-hunk-section-p eieio-oref start content end] 6 (#$ . 4607)]) | |
| 29 | #@28 | |
| 30 | ||
| 31 | (fn SECTIONS &rest ARGS) | |
| 32 | (defalias 'magit-apply-diffs #[385 "\300!\262\301\302\303\304##\207" [magit-apply--get-diffs magit-apply-patch mapconcat #[257 "\300!\301!P\207" [magit-diff-file-header magit-apply--section-content] 4 "\n\n(fn S)"] ""] 9 (#$ . 4837)]) | |
| 33 | #@27 | |
| 34 | ||
| 35 | (fn SECTION &rest ARGS) | |
| 36 | (defalias 'magit-apply-diff #[385 "\300C!@\262\301\302!\303!P#\207" [magit-apply--get-diffs magit-apply-patch magit-diff-file-header magit-apply--section-content] 8 (#$ . 5113)]) | |
| 37 | #@28 | |
| 38 | ||
| 39 | (fn SECTIONS &rest ARGS) | |
| 40 | (defalias 'magit-apply-hunks #[385 "\300@\301\"\302\303\300\304\"\"\203 \305\306!\210\307\300\310\"\311\312\313#P#\207" [eieio-oref parent string-match "^diff --cc" value user-error "Cannot un-/stage resolution hunks. Stage the whole file" magit-apply-patch header mapconcat magit-apply--section-content ""] 11 (#$ . 5331)]) | |
| 41 | #@27 | |
| 42 | ||
| 43 | (fn SECTION &rest ARGS) | |
| 44 | (defalias 'magit-apply-hunk #[385 "\300\301\302!\"\203 \303\304!\210\305\306\307\"\310!\311!P#\207" [string-match "^diff --cc" magit-section-parent-value user-error "Cannot un-/stage resolution hunks. Stage the whole file" magit-apply-patch eieio-oref parent magit-diff-file-header magit-apply--section-content] 8 (#$ . 5698)]) | |
| 45 | #@27 | |
| 46 | ||
| 47 | (fn SECTION &rest ARGS) | |
| 48 | (defalias 'magit-apply-region #[385 "\300 \204 \301\302!\210\303\304\305!\"\203 \301\306!\210\307\310\311\"\312!\313\"P#\207" [magit-diff-context-p user-error "Not enough context to apply region. Increase the context" string-match "^diff --cc" magit-section-parent-value "Cannot un-/stage resolution hunks. Stage the whole file" magit-apply-patch eieio-oref parent magit-diff-file-header magit-diff-hunk-region-patch] 9 (#$ . 6066)]) | |
| 49 | #@29 | |
| 50 | ||
| 51 | (fn SECTION:S ARGS PATCH) | |
| 52 | (defalias 'magit-apply-patch #[771 ":\204 \304\305\"C\202 \306\307\"\310!\211\203& \311\312\"\203& \313\314\"\202' \315\316 ?\317 \203; \n\204; \320\321P\"\210\322\323!r\211q\210\324\325\326\327\330!\331\"\332$\216c\210\333\315 \334\205] \335\205c \336\337\340&\210*\210\n?\205| \203z \341\342P\"\210\343 \207" [this-command magit-wip-before-change-mode inhibit-magit-refresh magit-wip-after-apply-mode eieio-oref value mapcar #[257 "\300\301\"\207" [eieio-oref value] 4 "\n\n(fn IT)"] symbol-name string-match "^magit-\\([^-]+\\)" match-string 1 "apply" magit-diff-context-p magit-diff-ignore-any-space-p magit-wip-commit-before-change " before " generate-new-buffer " *temp*" make-byte-code 0 "\301\300!\205 \302\300!\207" vconcat vector [buffer-name kill-buffer] 2 magit-run-git-with-input "-p0" "--unidiff-zero" "-C0" "--ignore-space-change" "-" magit-wip-commit-after-apply " after " magit-refresh] 17 (#$ . 6544)]) | |
| 53 | (defalias 'magit-apply--get-selection #[0 "\300\301\302\"\206+ \303 \304\305\"\211\306>\203 \202' \211\307>\203$ \304\310\"\202' \311\312!\262\262\207" [magit-region-sections (hunk file module) t magit-current-section eieio-oref type (module file hunk) (stashed-untracked stashed-worktree stashed-index untracked unstaged staged) children user-error "Cannot apply this, it's not a change"] 5]) | |
| 54 | #@17 | |
| 55 | ||
| 56 | (fn SECTIONS) | |
| 57 | (defalias 'magit-apply--get-diffs #[257 "\300 \211\203 \301\302\"\203 \303\304\"\202 \207" [magit-current-section magit-section-match-1 [file diffstat] mapcar #[257 "\301\302\303\304\305\"BC\306!\"!\206 \307\310!\207" [magit-root-section magit-get-section append file eieio-oref value magit-section-ident error "Cannot get required diff headers"] 7 "\n\n(fn IT)"]] 5 (#$ . 7924)]) | |
| 58 | (defalias 'magit-apply--diff-ignores-whitespace-p #[0 "\302\303\304!\203 \3058\202 \306\307\310$\205 \311\207" [magit-refresh-args magit-diff-section-arguments cl-intersection derived-mode-p magit-diff-mode 2 ("--ignore-space-at-eol" "--ignore-space-change" "--ignore-all-space" "--ignore-blank-lines") :test equal t] 5]) | |
| 59 | #@180 Add the change at point to the staging area. | |
| 60 | With a prefix argument, INTENT, and an untracked file (or files) | |
| 61 | at point, stage the file but not its content. | |
| 62 | ||
| 63 | (fn &optional INTENT) | |
| 64 | (defalias 'magit-stage #[256 "\300\301!\205 \302 \211\203\314\303 \304 \305 E\211:\205\307\211@\211\306\267\202\304A\211:\205= \211A\211:\205; \211A\211?\2059 \307!\262\262\262\202\305A\211:\205\\\211@\211\310\267\202YA\211:\205f \211A\211?\205d \311\312\"\262\262\202ZA\211:\205\200 \211A\211?\205~ \313\312\"\262\262\202ZA\211:\205\232 \211A\211?\205\230 \314\312\"\262\262\202ZA\211:\205\333 \211@\211\315=\203\277 A\211?\205\272 \316\312\"\262\202\331 \211\204\330 A\211?\205\323 \317\320\321\n\322\"C\"\262\202\331 \323\262\262\202ZA\211:\205\211@\211\315=\203 A\211?\205\373 \324\312\"\262\202\211\204A\211?\205\317\320\325\323\315\"\"\262\202\323\262\262\202ZA\211:\205T\211@\211\315=\203?A\211?\205:\324\312\"\262\202R\211\204QA\211?\205L\326 \262\202R\323\262\262\202Z\323\262\262\202\305A\211:\205}\211A\211:\205{\211A\211?\205y\327\330!\262\262\262\202\305A\211:\205\236\211A\211:\205\234\211A\211?\205\232\327\331!\262\262\262\202\305A\211:\205\277\211A\211:\205\275\211A\211?\205\273\327\332!\262\262\262\202\305\323\262\262\202\317\333\334!\207" [derived-mode-p magit-mode magit-apply--get-selection magit-diff-type magit-diff-scope magit-apply--diff-ignores-whitespace-p #s(hash-table size 5 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (untracked 32 unstaged 66 staged 353 committed 386 undefined 419)) magit-stage-untracked #s(hash-table size 6 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (region 81 hunk 107 hunks 133 file 159 files 224 list 287)) magit-apply-region "--cached" magit-apply-hunk magit-apply-hunks t magit-apply-diff magit-stage-1 "-u" eieio-oref value nil magit-apply-diffs magit-region-values magit-stage-modified user-error "Already staged" "Cannot stage committed changes" "Cannot stage this change" call-interactively magit-stage-file] 14 (#$ . 8664) "P"]) | |
| 65 | #@194 Stage all changes to FILE. | |
| 66 | With a prefix argument or when there is no file at point ask for | |
| 67 | the file to be staged. Otherwise stage the file at point without | |
| 68 | requiring confirmation. | |
| 69 | ||
| 70 | (fn FILE) | |
| 71 | (defalias 'magit-stage-file #[257 "\301 \211\203 \211\302\303C\")\202 \304 \207" [default-directory magit-toplevel magit-stage-1 nil magit--not-inside-repository-error] 5 (#$ . 10795) (byte-code "\301\302!\303 \304 \305 \244\206 \235@\204 \211\204( \306\307\310\311\310\211&\202) \211C\207" [current-prefix-arg magit-section-value-if file magit-file-relative-name magit-unstaged-files magit-untracked-files magit-completing-read "Stage file" nil t] 12)]) | |
| 72 | #@280 Stage all changes to files modified in the worktree. | |
| 73 | Stage all new content of tracked files and remove tracked files | |
| 74 | that no longer exist in the working tree from the index also. | |
| 75 | With a prefix argument also stage previously untracked (but not | |
| 76 | ignored) files. | |
| 77 | ||
| 78 | (fn &optional ALL) | |
| 79 | (defalias 'magit-stage-modified #[256 "\301 \203 \302\303!\210\304 \211\203 \211\305\203 \306\202 \307!)\202\" \310 \207" [default-directory magit-anything-staged-p magit-confirm stage-all-changes magit-toplevel magit-stage-1 "--all" "-u" magit--not-inside-repository-error] 4 (#$ . 11464) "P"]) | |
| 80 | #@28 | |
| 81 | ||
| 82 | (fn ARG &optional FILES) | |
| 83 | (defalias 'magit-stage-1 #[513 "\301\302\"\210\303\304\203 \305B\202 \306#\210\203 \307\310\"\210\311\312\"\207" [magit-auto-revert-mode magit-wip-commit-before-change " before stage" magit-run-git "add" "--" "." mapc magit-turn-on-auto-revert-mode-if-desired magit-wip-commit-after-apply " after stage"] 7 (#$ . 12051)]) | |
| 84 | #@25 | |
| 85 | ||
| 86 | (fn &optional INTENT) | |
| 87 | (defalias 'magit-stage-untracked #[256 "\303 \304 \211\305\267\202 \306\307\"C\202 \310\311\312\"\202 \313 \202 \311\262\311\211\211\203K \211@\314!\204? \315\312\"\203? \211B\262\202D \211B\262A\266\202\202$ \210\316\317\"\210\203j \320\321\205] \322\323$\210\203j \324\325\"\210\211\211\203\350 \211@\212\306\326\327B\330B!\331\"b\210\332 \333\301!\205\207 \232\205\221 \334\335!!\336\337\340!!\341\342\343 \344#\206\246 \337\345!P)\346\"#\210\211\203\336 \347\340\350\"!\210 \351!\210)\352\353\354\"!\203\336 \355\356!\203\336 \355\357!\203\336 \356!\210\357!\210\266)A\266\202\202k \210\360\361\"\207" [magit-auto-revert-mode borg-user-emacs-directory default-directory magit-current-section magit-diff-scope #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (file 10 files 18 list 25)) eieio-oref value magit-region-values nil t magit-untracked-files file-symlink-p magit-git-repo-p magit-wip-commit-before-change " before stage" magit-run-git "add" "--intent-to-add" "--" mapc magit-turn-on-auto-revert-mode-if-desired magit-get-section file ((untracked) (status)) start magit-toplevel boundp file-name-nondirectory directory-file-name magit-submodule-add file-name-as-directory expand-file-name magit-get "remote" magit-get-some-remote "url" "." magit-submodule-read-name-for-path borg--sort-submodule-sections ".gitmodules" borg--maybe-absorb-gitdir y-or-n-p format "Also build and activate `%s' drone?" fboundp borg-build borg-activate magit-wip-commit-after-apply " after stage"] 15 (#$ . 12416)]) | |
| 88 | #@51 Remove the change at point from the staging area. | |
| 89 | (defalias 'magit-unstage #[0 "\301 \211\205\317\302 \303 \304 E\211:\205\315\211@\211\305\267\202\312A\211:\2056 \211A\211:\2054 \211A\211?\2052 \306\307!\262\262\262\202\313A\211:\205W \211A\211:\205U \211A\211?\205S \306\310!\262\262\262\202\313A\211:\205z\211@\211\311\267\202wA\211:\205\201 \211A\211?\205 \312\313\314#\262\262\202xA\211:\205\234 \211A\211?\205\232 \315\313\314#\262\262\202xA\211:\205\267 \211A\211?\205\265 \316\313\314#\262\262\202xA\211:\205\370 \211@\211\317=\203\335 A\211?\205\330 \320\313\314#\262\202\366 \211\204\365 A\211?\205\360 \321\322 \323\"C!\262\202\366 \324\262\262\202xA\211:\2057\211@\211\317=\203 A\211?\205\325\313\314#\262\2025\211\2044A\211?\205/\321\326\324\317\"!\262\2025\324\262\262\202xA\211:\205r\211@\211\317=\203]A\211?\205X\325\313\314#\262\202p\211\204oA\211?\205j\327 \262\202p\324\262\262\202x\324\262\262\202\313A\211:\205\244\211A\211:\205\242\211A\211?\205\240\203\235\330 \202\240\306\331!\262\262\262\202\313A\211:\205\305\211A\211:\205\303\211A\211?\205\301\306\332!\262\262\262\202\313\324\262\262\207" [magit-unstage-committed magit-apply--get-selection magit-diff-type magit-diff-scope magit-apply--diff-ignores-whitespace-p #s(hash-table size 5 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (untracked 26 unstaged 59 staged 92 committed 383 undefined 425)) user-error "Cannot unstage untracked changes" "Already unstaged" #s(hash-table size 6 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (region 107 hunk 134 hunks 161 file 188 files 253 list 316)) magit-apply-region "--reverse" "--cached" magit-apply-hunk magit-apply-hunks t magit-apply-diff magit-unstage-1 eieio-oref value nil magit-apply-diffs magit-region-values magit-unstage-all magit-reverse-in-index "Cannot unstage committed changes" "Cannot unstage this change"] 12 (#$ . 14030) nil]) | |
| 90 | #@200 Unstage all changes to FILE. | |
| 91 | With a prefix argument or when there is no file at point ask for | |
| 92 | the file to be unstaged. Otherwise unstage the file at point | |
| 93 | without requiring confirmation. | |
| 94 | ||
| 95 | (fn FILE) | |
| 96 | (defalias 'magit-unstage-file #[257 "\301 \211\203 \211\302C!)\202 \303 \207" [default-directory magit-toplevel magit-unstage-1 magit--not-inside-repository-error] 4 (#$ . 16045) (byte-code "\301\302!\303 \304 \206\f \235@\204 \211\204% \305\306\307\310\307\211&\202& \211C\207" [current-prefix-arg magit-section-value-if file magit-file-relative-name magit-staged-files magit-completing-read "Unstage file" nil t] 12)]) | |
| 97 | #@14 | |
| 98 | ||
| 99 | (fn FILES) | |
| 100 | (defalias 'magit-unstage-1 #[257 "\300\301\"\210\302 \203 \303\304\305\306$\210\202 \303\307\310\306$\210\311\312\"\207" [magit-wip-commit-before-change " before unstage" magit-no-commit-p magit-run-git "rm" "--cached" "--" "reset" "HEAD" magit-wip-commit-after-apply " after unstage"] 6 (#$ . 16684)]) | |
| 101 | #@43 Remove all changes from the staging area. | |
| 102 | (defalias 'magit-unstage-all #[0 "\300 \204\n \301 \203 \302\303!\210\304\305\306\"\210\307\310\311\312#\210\313\305\314\"\207" [magit-anything-unstaged-p magit-untracked-files magit-confirm unstage-all-changes magit-wip-commit-before-change nil " before unstage" magit-run-git "reset" "HEAD" "--" magit-wip-commit-after-apply " after unstage"] 4 (#$ . 17012) nil]) | |
| 103 | #@29 Remove the change at point. | |
| 104 | (defalias 'magit-discard #[0 "\300 \211\205\300 \301 \302 D\211:\205\276 \211@\211\303\267\202H A\211:\205+ \211A\211?\205) \304\305!\262\262\202\274 A\211:\205C \211A\211?\205A \304\306!\262\262\202\274 A\211:\205\272 \211@\211\307\267\202\267 A\211?\205b \310!\262\202\270 A\211?\205r \311!\262\202\270 A\211?\205\202 \312!\262\202\270 A\211?\205\222 \313!\262\202\270 A\211?\205\242 \314!\262\202\270 A\211?\205\262 \314!\262\202\270 \315\262\262\262\262\207" [magit-apply--get-selection magit-diff-type magit-diff-scope #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (committed 24 undefined 48)) user-error "Cannot discard committed changes" "Cannot discard this change" #s(hash-table size 6 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (region 87 hunk 103 hunks 119 file 135 files 151 list 167)) magit-discard-region magit-discard-hunk magit-discard-hunks magit-discard-file magit-discard-files nil] 8 (#$ . 17427) nil]) | |
| 105 | #@16 | |
| 106 | ||
| 107 | (fn SECTION) | |
| 108 | (defalias 'magit-discard-region #[257 "\300\301\302\"\210\303\304\"\207" [magit-confirm discard "Discard region" magit-discard-apply magit-apply-region] 4 (#$ . 18479)]) | |
| 109 | #@16 | |
| 110 | ||
| 111 | (fn SECTION) | |
| 112 | (defalias 'magit-discard-hunk #[257 "\300\301\302\"\210\303\304\"\207" [magit-confirm discard "Discard hunk" magit-discard-apply magit-apply-hunk] 4 (#$ . 18671)]) | |
| 113 | #@22 | |
| 114 | ||
| 115 | (fn SECTION APPLY) | |
| 116 | (defalias 'magit-discard-apply #[514 "\301!\302=\203 \211\303\"\207\304\305\306!\203 \307\310\"\202 \311!\"\2035 \312\211\303\313#\210\211\303\314#\210)\315 \207\211\303\316#\207" [inhibit-magit-refresh magit-diff-type unstaged "--reverse" magit-anything-unstaged-p nil magit-file-section-p eieio-oref value magit-section-parent-value t "--cached" "--reject" magit-refresh "--index"] 7 (#$ . 18857)]) | |
| 117 | #@17 | |
| 118 | ||
| 119 | (fn SECTIONS) | |
| 120 | (defalias 'magit-discard-hunks #[257 "\300\301\302\303G\304@!#\"\210\305\306\"\207" [magit-confirm discard format "Discard %s hunks from %s" magit-section-parent-value magit-discard-apply-n magit-apply-hunks] 8 (#$ . 19297)]) | |
| 121 | #@23 | |
| 122 | ||
| 123 | (fn SECTIONS APPLY) | |
| 124 | (defalias 'magit-discard-apply-n #[514 "@\301!\302=\203 \303\"\202@ \304\305\306!\203 \307\310\"\202# \311!\"\203; \312\303\313#\210\303\314#\210)\315 \202@ \303\316#\207" [inhibit-magit-refresh magit-diff-type unstaged "--reverse" magit-anything-unstaged-p nil magit-file-section-p eieio-oref value magit-section-parent-value t "--cached" "--reject" magit-refresh "--index"] 8 (#$ . 19549)]) | |
| 125 | #@16 | |
| 126 | ||
| 127 | (fn SECTION) | |
| 128 | (defalias 'magit-discard-file #[257 "\300C!\207" [magit-discard-files] 3 (#$ . 19986)]) | |
| 129 | #@17 | |
| 130 | ||
| 131 | (fn SECTIONS) | |
| 132 | (defalias 'magit-discard-files #[257 "\302\303@!\304 \302\211\211\211\211\211\211 \n\211\203t\211@\305\306\"\211\nB\262\n \307\267\2026 \310\2027 \311\2027 \312\2027 \302\313 \"AAB\211:\203k\211@\211\312=\203~A\211\204m \314\302\"\211\203i \211@\211B\262A\266\202\202V \210\202z\211:\203z\211@\211\315\267\202=A\211:\203\251 \211@\211\316\267\202\250 A\211\204\226 B\262\210\202\250 A\211\204\247 B\262 \210\210\210\202yA\211:\203\334 \211@\211\317\267\202\333 A\211\204\311 B\262\210\202\333 A\211\204\332 B\262 \210\210\210\202yA\211:\203 \211@\211\320\267\202 A\211\204\374 B\262\210\202 A\211\204 B\262\210\202 A\211\204 B\262 \210\210\210\202yA\211:\2039\211A\211\2048\nB\262\n\210\210\202yA\211:\203x\211@\211\321=\203]A\211\204Y B\262 \210\202w\322=\203w\211\322=\203wA\211\204v B\262 \210\210\210\210\210\202jA\211:\203i\211@\211\323\267\202A\211:\203\374\211@\211\324=\203\255A\211\204\251B\262\210\202\373\211\321=\203\304A\211\204\300 B\262 \210\202\373\311=\203\341\211\325=\203\373A\211\204\335 B\262 \210\202\373\310=\203\373\211\326>\203\373A\211\204\372B\262\210\210\210\202hA\211:\203\211A\211\204\nB\262\n\210\210\202hA\211:\203g\211@\211\321=\2039A\211\2045 B\262 \210\202f\322=\203\276\211\322=\203VA\211\204R B\262 \210\202f\311=\203\207\211\327\267\202fA\211\204o B\262 \210\202fA\211\204\200B\262\210\202f\202f\310=\203f\211\325=\203\244A\211\204\240\fB\262\f\210\202f\211\330>\203fA\211\204\267B\262\210\202f\202f\310=\2035\325=\203\341\211\331>\203fA\211\204\335 B\262 \210\202f\332=\203\211\325=\203\376A\211\204\372\fB\262\f\210\202f\211\333>\203fA\211\204B\262\210\202f\202f\334=\203f\211\335>\203fA\211\2041B\262\210\202f\311=\203f\211\325=\203RA\211\204N B\262 \210\202f\211\324=\203fA\211\204eB\262\210\210\210\210\210\210\266A\266\202\202 \210\336\216\337\340\341\"\210\211\203\210\342\237!\210\203\221\343\237!\210\203\235\344\237 \"\210\203\250\345\237 \"\210\204\260\203\267\346\237\237\"\210\347\350\"+\207" [auto-revert-verbose inhibit-magit-refresh nil magit-diff-type magit-file-status eieio-oref value #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (staged 42 unstaged 46 untracked 50)) 88 89 90 assoc magit-untracked-files #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (63 122 33 173 68 224 85 292)) #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (63 137 85 154)) #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (33 188 85 205)) #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (32 239 68 256 85 273)) 85 65 #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (68 397 85 512)) 68 77 (77 32) #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (77 610 68 627)) (68 32) (68 77 32) 67 (68 32) 82 (68 77 32) #[0 "\300 \207" [magit-refresh] 1] t magit-wip-commit-before-change " before discard" magit-discard-files--resolve magit-discard-files--resurrect magit-discard-files--delete magit-discard-files--rename magit-discard-files--discard magit-wip-commit-after-apply " after discard"] 23 (#$ . 20096)]) | |
| 133 | #@14 | |
| 134 | ||
| 135 | (fn FILES) | |
| 136 | (defalias 'magit-discard-files--resolve #[257 "\211A\205. \300\301\302G\303\304\305##\306P\307\"\211\310\267\202+ \311\202, \312\202, \313\202, \314\202, \314\262\211\203J \211\205E \211@\315\"\210A\266\202\2023 \262\202a \211\205_ \211@\315\316!\"\210A\266\202\202K \262\207" [read-char-choice format "For these %i files\n%s\ncheckout:\n" mapconcat #[257 "\300P\207" [" "] 3 "\n\n(fn FILE)"] "\n" "[o]ur stage, [t]heir stage, [c]onflict, decide [i]ndividually, or [C-g] to abort " (111 116 99 105) #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (111 27 116 31 99 35 105 39)) "--ours" "--theirs" "--merge" nil magit-checkout-stage magit-checkout-read-stage] 9 (#$ . 23604)]) | |
| 137 | #@14 | |
| 138 | ||
| 139 | (fn FILES) | |
| 140 | (defalias 'magit-discard-files--resurrect #[257 "\300\301\"\210\302 \303=\203 \304\305\306#\207\304\307\306#\207" [magit-confirm-files resurrect magit-diff-type staged magit-call-git "reset" "--" "checkout"] 5 (#$ . 24352)]) | |
| 141 | #@21 | |
| 142 | ||
| 143 | (fn FILES STATUS) | |
| 144 | (defalias 'magit-discard-files--delete #[514 "\303\203 \304\202\n \305\"\210\211\205\220 \211@\306 \307>\203* \310\n#\210\311!\210\202\211 \312\313\"8\211\314\267\202\210 \315\316\"\210\317\320\321\322$\210\202\210 \323\324\325#\326\327\330\331!\"\"\210\332\333\334\"\335P\211\262\"\210\315\316\"\266\317\320\321\336\322%\210\202\210 \317\337\322#\210\315\316\"\210\317\320\321\336\322%\210\210A\266\202\202 \262)\207" [magit-delete-by-moving-to-trash delete-by-moving-to-trash dired-recursive-deletes magit-confirm-files trash delete magit-diff-type (unstaged untracked) dired-delete-file dired-clean-up-after-deletion 3 assoc #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (32 54 77 69 68 116)) delete-file t magit-call-git "rm" "--cached" "--" magit-git-string "checkout-index" "--temp" string-match format "\\(.+?\\) %s" regexp-quote rename-file match-string 1 ".~{index}~" "--force" "checkout"] 11 (#$ . 24600)]) | |
| 145 | #@21 | |
| 146 | ||
| 147 | (fn FILES STATUS) | |
| 148 | (defalias 'magit-discard-files--rename #[514 "\300\301\302\303\304\305\306\307\310\311\312 !\313\"\314\315%\"%\210\211\205V \211@\316\"A@\317!\203A \320!\211\2037 \321\322\"\210\210\323\324#\210\202N \323\325\326\327$\210\323\330\327#\210\210A\266\202\202 \207" [magit-confirm rename "Undo rename %s" "Undo %i renames" nil mapcar make-byte-code 257 "\301\300\"\262\302\303A@@#\207" vconcat vector [assoc format "%s -> %s"] 5 "\n\n(fn FILE)" assoc file-exists-p file-name-directory make-directory t magit-call-git "mv" "rm" "--cached" "--" "reset"] 14 (#$ . 25613)]) | |
| 149 | #@27 | |
| 150 | ||
| 151 | (fn SECTIONS NEW-FILES) | |
| 152 | (defalias 'magit-discard-files--discard #[514 "\300\301\"\302\303\304\"\305\306\307 \"#\210\307@!\310=\203\" \311\312\313#\202\321 \2032 \311\314\313#\210\311\315\313#\210\316\317!\211\203d \320\321\203\\ @\322\323\"\235\204P \211B\262\210\211T\262A\262\202< \266\211\237\262\262G\324U\203t \325@\326\"\210\202} \203} \327\330\"\210\211\205\317 \331\332!\320\211\321\203\256 @\211\235\203\235 \211B\262\202\242 \211B\262\210\211T\262A\262\202\210 \266\237\237D\266\202\266\202\211A@\203\307 \311\315\313A@#\210\211@\205\317 \333\334!\262\207" [mapcar #[257 "\300\301\"\207" [eieio-oref value] 4 "\n\n(fn IT)"] magit-confirm-files discard append format "Discard %s changes in" magit-diff-type unstaged magit-call-git "checkout" "--" "add" "reset" magit-binary-files "--cached" nil 0 eieio-oref value 1 magit-discard-apply magit-apply-diff magit-discard-apply-n magit-apply-diffs magit-unstaged-files t user-error "Cannot discard staged changes to binary files, which also have unstaged changes. Unstage instead."] 12 (#$ . 26224)]) | |
| 153 | #@181 Reverse the change at point in the working tree. | |
| 154 | With a prefix argument fallback to a 3-way merge. Doing | |
| 155 | so causes the change to be applied to the index as well. | |
| 156 | ||
| 157 | (fn &rest ARGS) | |
| 158 | (defalias 'magit-reverse #[128 "\300 \211\205\314 \301 \302 D\211:\205\312 \211@\211\303\267\202H A\211:\205+ \211A\211?\205) \304\305!\262\262\202\310 A\211:\205C \211A\211?\205A \304\306!\262\262\202\310 A\211:\205\306 \211@\211\307\267\202\303 A\211?\205d \310\"\262\202\304 A\211?\205v \311\"\262\202\304 A\211?\205\210 \312\"\262\202\304 A\211?\205\232 \313\"\262\202\304 A\211?\205\254 \314\"\262\202\304 A\211?\205\276 \314\"\262\202\304 \315\262\262\262\262\207" [magit-apply--get-selection magit-diff-type magit-diff-scope #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (untracked 24 unstaged 48)) user-error "Cannot reverse untracked changes" "Cannot reverse unstaged changes" #s(hash-table size 6 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (region 87 hunk 105 hunks 123 file 141 files 159 list 177)) magit-reverse-region magit-reverse-hunk magit-reverse-hunks magit-reverse-file magit-reverse-files nil] 10 (#$ . 27332) (byte-code "\205 \301C\207" [current-prefix-arg "--3way"] 1)]) | |
| 159 | #@21 | |
| 160 | ||
| 161 | (fn SECTION ARGS) | |
| 162 | (defalias 'magit-reverse-region #[514 "\300\301\302\"\210\303\304#\207" [magit-confirm reverse "Reverse region" magit-reverse-apply magit-apply-region] 6 (#$ . 28620)]) | |
| 163 | #@21 | |
| 164 | ||
| 165 | (fn SECTION ARGS) | |
| 166 | (defalias 'magit-reverse-hunk #[514 "\300\301\302\"\210\303\304#\207" [magit-confirm reverse "Reverse hunk" magit-reverse-apply magit-apply-hunk] 6 (#$ . 28817)]) | |
| 167 | #@22 | |
| 168 | ||
| 169 | (fn SECTIONS ARGS) | |
| 170 | (defalias 'magit-reverse-hunks #[514 "\300\301\302\303G\304@!#\"\210\305\306#\207" [magit-confirm reverse format "Reverse %s hunks from %s" magit-section-parent-value magit-reverse-apply magit-apply-hunks] 9 (#$ . 29008)]) | |
| 171 | #@21 | |
| 172 | ||
| 173 | (fn SECTION ARGS) | |
| 174 | (defalias 'magit-reverse-file #[514 "\300C\"\207" [magit-reverse-files] 5 (#$ . 29263)]) | |
| 175 | #@22 | |
| 176 | ||
| 177 | (fn SECTIONS ARGS) | |
| 178 | (defalias 'magit-reverse-files #[514 "\301\302\303!\203 @\304\305\211#\262\202 \302\306!\203 @\202 \307!\310\211\311\203M @\312\313\"\235\203< \211B\262\202A \211B\262\210\211T\262A\262\202$ \266\237\237D\266\202\262\211@A\211@A\314\315\316\317\"\"\210G\320U\203| \321@\322\n#\210\202\207 \203\207 \321\323\n#\210\211\205\216 \324\325!\266\202\207" [magit-refresh-args magit-binary-files derived-mode-p magit-revision-mode format "%s^..%s" magit-diff-mode "--cached" nil 0 eieio-oref value magit-confirm-files reverse mapcar #[257 "\300\301\"\207" [eieio-oref value] 4 "\n\n(fn IT)"] 1 magit-reverse-apply magit-apply-diff magit-apply-diffs user-error "Cannot reverse binary files"] 14 (#$ . 29380)]) | |
| 179 | #@29 | |
| 180 | ||
| 181 | (fn SECTION:S APPLY ARGS) | |
| 182 | (defalias 'magit-reverse-apply #[771 "\301?\205 \302\235?\205 \303$\207" [magit-reverse-atomically "--reverse" "--3way" "--reject"] 9 (#$ . 30145)]) | |
| 183 | #@774 Reverse the change at point in the index but not the working tree. | |
| 184 | ||
| 185 | Use this command to extract a change from `HEAD', while leaving | |
| 186 | it in the working tree, so that it can later be committed using | |
| 187 | a separate commit. A typical workflow would be: | |
| 188 | ||
| 189 | 0. Optionally make sure that there are no uncommitted changes. | |
| 190 | 1. Visit the `HEAD' commit and navigate to the change that should | |
| 191 | not have been included in that commit. | |
| 192 | 2. Type "u" (`magit-unstage') to reverse it in the index. | |
| 193 | This assumes that `magit-unstage-committed-changes' is non-nil. | |
| 194 | 3. Type "c e" to extend `HEAD' with the staged changes, | |
| 195 | including those that were already staged before. | |
| 196 | 4. Optionally stage the remaining changes using "s" or "S" | |
| 197 | and then type "c c" to create a new commit. | |
| 198 | ||
| 199 | (fn &rest ARGS) | |
| 200 | (defalias 'magit-reverse-in-index #[128 "\300\301B!\207" [magit-reverse "--cached"] 4 (#$ . 30336) nil]) | |
| 201 | (provide 'magit-apply) | |
