| 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 | #@55 Popup console for reset commands. | |
| 17 | ||
| 18 | (fn &optional ARG) | |
| 19 | (defalias 'magit-reset-popup #[256 "\300\301\302#\207" [magit-invoke-popup magit-reset-popup nil] 5 (#$ . 425) "P"]) | |
| 20 | (defvar magit-reset-popup (list :variable 'magit-reset-arguments :man-page "git-reset" :actions '((109 "reset mixed (HEAD and index)" magit-reset-mixed) (115 "reset soft (HEAD only)" magit-reset-soft) (104 "reset hard (HEAD, index, and files)" magit-reset-hard) (105 "reset index (only)" magit-reset-index) (119 "reset worktree (only)" magit-reset-worktree) nil (102 "reset a file" magit-file-checkout)) :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-reset-popup custom-declare-variable magit-reset-arguments funcall function #[0 "\301\302\"\207" [magit-reset-popup plist-get :default-arguments] 3] "" :group magit-git-arguments :type (repeat (string :tag "Argument"))] 8) | |
| 22 | (defalias 'magit-reset-arguments #[0 "\303=\203 \207\n\207" [magit-current-popup magit-current-popup-args magit-reset-arguments magit-reset-popup] 2]) | |
| 23 | (put 'magit-reset-arguments 'definition-name 'magit-reset-popup) | |
| 24 | #@106 Reset the `HEAD' and index to COMMIT, but not the working tree. | |
| 25 | ||
| 26 | (git reset --mixed COMMIT) | |
| 27 | ||
| 28 | (fn COMMIT) | |
| 29 | (defalias 'magit-reset-mixed #[257 "\300\301\"\207" [magit-reset-internal "--mixed"] 4 (#$ . 1603) (byte-code "\300\301!C\207" [magit-reset-read-branch-or-commit "Reset %s to"] 2)]) | |
| 30 | #@107 Reset the `HEAD' to COMMIT, but not the index and working tree. | |
| 31 | ||
| 32 | (git reset --soft REVISION) | |
| 33 | ||
| 34 | (fn COMMIT) | |
| 35 | (defalias 'magit-reset-soft #[257 "\300\301\"\207" [magit-reset-internal "--soft"] 4 (#$ . 1898) (byte-code "\300\301!C\207" [magit-reset-read-branch-or-commit "Soft reset %s to"] 2)]) | |
| 36 | #@96 Reset the `HEAD', index, and working tree to COMMIT. | |
| 37 | ||
| 38 | (git reset --hard REVISION) | |
| 39 | ||
| 40 | (fn COMMIT) | |
| 41 | (defalias 'magit-reset-hard #[257 "\300\301\"\207" [magit-reset-internal "--hard"] 4 (#$ . 2196) (byte-code "\300\301\302\303\304#\305P!C\207" [magit-reset-read-branch-or-commit propertize "Hard" face bold " reset %s to"] 5)]) | |
| 42 | #@174 Reset the index to COMMIT. | |
| 43 | Keep the `HEAD' and working tree as-is, so if COMMIT refers to the | |
| 44 | head this effectively unstages all changes. | |
| 45 | ||
| 46 | (git reset COMMIT .) | |
| 47 | ||
| 48 | (fn COMMIT) | |
| 49 | (defalias 'magit-reset-index #[257 "\300\301\302#\207" [magit-reset-internal nil "."] 5 (#$ . 2526) (byte-code "\300\301!C\207" [magit-read-branch-or-commit "Reset index to"] 2)]) | |
| 50 | #@77 Reset the worktree to COMMIT. | |
| 51 | Keep the `HEAD' and index as-is. | |
| 52 | ||
| 53 | (fn COMMIT) | |
| 54 | (defalias 'magit-reset-worktree #[257 "\304\305\306\307\310!!!\311\312\313\314\315!\316\"\317$\216\320 \211\203n \211\211\2034 \321\322\304\323P$\2044 \324\325\"\210\210\326 !\203T \327P\nB\330\304\331\"\210\332\333\334\335#\210\336\304\337\")\202j \327P B\330\304\331\"\210\332\333\334\335#\210\336\304\337\"))\202p \340 \262*\207" [magit--refresh-cache default-directory magit-tramp-process-environment process-environment nil magit-convert-filename-for-git make-temp-name magit-git-dir "index.magit." make-byte-code 0 "\3021 \303\304 !\300P!0\207\210\305\207" vconcat vector [default-directory (error) delete-file file-remote-p nil] 3 magit-toplevel magit-git-success "read-tree" "--index-output=" error "Cannot read tree %s" file-remote-p "GIT_INDEX_FILE=" magit-wip-commit-before-change " before reset" magit-run-git "checkout-index" "--all" "--force" magit-wip-commit-after-apply " after reset" magit--not-inside-repository-error] 11 (#$ . 2886) (byte-code "\300\301!C\207" [magit-read-branch-or-commit "Reset worktree to"] 2)]) | |
| 55 | #@196 Reset the `HEAD' and index to COMMIT, and possibly the working tree. | |
| 56 | With a prefix argument reset the working tree otherwise don't. | |
| 57 | ||
| 58 | (git reset --mixed|--hard COMMIT) | |
| 59 | ||
| 60 | (fn COMMIT &optional HARD) | |
| 61 | (defalias 'magit-reset-quickly #[513 "\300\203 \301\202\n \302\"\207" [magit-reset-internal "--hard" "--mixed"] 5 (#$ . 4019) (byte-code "\301\203 \302\303\304\305#\306P\202 \307!D\207" [current-prefix-arg magit-reset-read-branch-or-commit propertize "Hard" face bold " reset %s to" "Reset %s to"] 5)]) | |
| 62 | #@172 Prompt for and return a ref to reset HEAD to. | |
| 63 | ||
| 64 | PROMPT is a format string, where either the current branch name | |
| 65 | or "detached head" will be substituted for %s. | |
| 66 | ||
| 67 | (fn PROMPT) | |
| 68 | (defalias 'magit-reset-read-branch-or-commit #[257 "\300\301\302 \206 \303\"!\207" [magit-read-branch-or-commit format magit-get-current-branch "detached head"] 5 (#$ . 4531)]) | |
| 69 | #@34 | |
| 70 | ||
| 71 | (fn ARG COMMIT &optional PATH) | |
| 72 | (defalias 'magit-reset-internal #[770 "\301\235\2049 \302!\302\303!\232\2039 \304\305!r\211q\210\306\307\310\311\312!\313\"\314$\216\315\316\317\320\321$\210\2031 \210\322 \210\323 \210*\210\321\232\203G \204G \324\202H \325\326\327\330P\"\210\331\325\332%\210\211\324\232\205b \333\327\334\"\207" [git-commit-major-mode ("--hard" nil) magit-rev-parse "HEAD~" generate-new-buffer " *temp*" make-byte-code 0 "\301\300!\205 \302\300!\207" vconcat vector [buffer-name kill-buffer] 2 magit-git-insert "show" "-s" "--format=%B" "HEAD" git-commit-setup-font-lock git-commit-save-message "unstage" "reset" magit-wip-commit-before-change nil " before " magit-run-git "--" magit-wip-commit-after-apply " after unstage"] 10 (#$ . 4887)]) | |
| 73 | (provide 'magit-reset) | |
