;ELC
|
;;; Compiled
|
;;; in Emacs version 26.1
|
;;; with all optimizations.
|
|
;;; This file uses dynamic docstrings, first added in Emacs 19.29.
|
|
;;; This file does not contain utf-8 non-ASCII characters,
|
;;; and so can be loaded in Emacs versions earlier than 23.
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
(byte-code "\300\301!\210\300\302!\210\303\304\305\306\307DD\310\311\312\313\314&\210\303\315\305\306\316DD\317\320\321\311\322\313\323& \210\303\324\305\306\325DD\326\320\327\311\322\313\330& \210\303\331\305\306\332DD\333\320\334\311\322\313\330& \210\303\335\305\306\336DD\337\320\340\311\322\313\330& \210\303\341\305\306\342DD\343\320\344\311\322\313\330& \210\303\345\305\306\346DD\347\320\350\311\322\313\351& \207" [require magit magit-sequence custom-declare-variable magit-commit-arguments funcall function #[0 "\300\207" [nil] 1] "The arguments used when committing." :group magit-git-arguments :type (repeat (string :tag "Argument")) magit-commit-ask-to-stage #[0 "\300\207" [verbose] 1] "Whether to ask to stage all unstaged changes when committing and nothing is staged." :package-version (magit . "2.3.0") magit-commands (choice (const :tag "Ask showing diff" verbose) (const :tag "Ask" t) (const :tag "Don't ask" nil)) magit-commit-show-diff #[0 "\300\207" [t] 1] "Whether the relevant diff is automatically shown when committing." (magit . "2.3.0") boolean magit-commit-extend-override-date #[0 "\300\207" [t] 1] "Whether using `magit-commit-extend' changes the committer date." (magit . "2.3.0") magit-commit-reword-override-date #[0 "\300\207" [t] 1] "Whether using `magit-commit-reword' changes the committer date." (magit . "2.3.0") magit-commit-squash-confirm #[0 "\300\207" [t] 1] "Whether the commit targeted by squash and fixup has to be confirmed.\nWhen non-nil then the commit at point (if any) is used as default\nchoice, otherwise it has to be confirmed. This option only\naffects `magit-commit-squash' and `magit-commit-fixup'. The\n\"instant\" variants always require confirmation because making\nan error while using those is harder to recover from." (magit . "2.1.0") magit-post-commit-hook #[0 "\300\207" [nil] 1] "Hook run after creating a commit without the user editing a message.\n\nThis hook is run by `magit-refresh' if `this-command' is a member\nof `magit-post-stage-hook-commands'. This only includes commands\nnamed `magit-commit-*' that do *not* require that the user edits\nthe commit message in a buffer and then finishes by pressing\n\\<with-editor-mode-map>\\[with-editor-finish].\n\nAlso see `git-commit-post-finish-hook'." (magit . "2.90.0") hook] 10)
|
(defvar magit-post-commit-hook-commands '(magit-commit-extend magit-commit-fixup magit-commit-augment magit-commit-instant-fixup magit-commit-instant-squash))
|
#@56 Popup console for commit commands.
|
|
(fn &optional ARG)
|
(defalias 'magit-commit-popup #[256 "\300 \211\203\f \301!\202 \302\303\304#\207" [magit-commit-message-buffer switch-to-buffer magit-invoke-popup magit-commit-popup nil] 6 (#$ . 2874) "P"])
|
(defvar magit-commit-popup '(:variable magit-commit-arguments :man-page "git-commit" :switches ((97 "Stage all modified and deleted files" "--all") (101 "Allow empty commit" "--allow-empty") (118 "Show diff of changes to be committed" "--verbose") (104 "Disable hooks" "--no-verify") (115 "Add Signed-off-by line" "--signoff") (82 "Claim authorship and reset author date" "--reset-author")) :options ((65 "Override the author" "--author=") (83 "Sign using gpg" "--gpg-sign=" magit-read-gpg-secret-key) (67 "Reuse commit message" "--reuse-message=" magit-read-reuse-message)) :actions ((99 "Commit" magit-commit-create) (101 "Extend" magit-commit-extend) (102 "Fixup" magit-commit-fixup) (70 "Instant Fixup" magit-commit-instant-fixup) nil (119 "Reword" magit-commit-reword) (115 "Squash" magit-commit-squash) (83 "Instant Squash" magit-commit-instant-squash) nil (97 "Amend" magit-commit-amend) (65 "Augment" magit-commit-augment)) :max-action-columns 4 :default-action magit-commit-create))
|
(magit-define-popup-keys-deferred 'magit-commit-popup)
|
(defalias 'magit-commit-arguments #[0 "\303=\203 \207\n\207" [magit-current-popup magit-current-popup-args magit-commit-arguments magit-commit-popup] 2])
|
(defvar magit-gpg-secret-key-hist nil)
|
#@39
|
|
(fn PROMPT &optional INITIAL-INPUT)
|
(defalias 'magit-read-gpg-secret-key #[513 "\302\303!\210\304\305\306\307!\310\311#\"\312\313\310\211\211\301 \206 @&\314\"@\207" [epa-protocol magit-gpg-secret-key-hist require epa mapcar #[257 "\303\211!>\204 \304\305\306D\"\210\307H@! >\2044 \304\305\310\303!>\204- \304\305\306D\"\210\307H@D\"\210\303!>\204C \304\305\306D\"\210\211\307H@\311H\312\303!>\204Y \304\305\306D\"\210\313H@\211\205\201 \303!\n>\204p \304\305\314D\"\210\211\307H\211;\203| \211\202 \315!\262\262Q\207" [cl-struct-epg-key-tags cl-struct-epg-sub-key-tags cl-struct-epg-user-id-tags type-of signal wrong-type-argument epg-key 2 epg-sub-key 6 " " 3 epg-user-id epg-decode-dn] 8 "\n\n(fn IT)"] epg-list-keys epg-make-context nil t split-string magit-completing-read " "] 12 (#$ . 4372)])
|
#@33
|
|
(fn PROMPT &optional DEFAULT)
|
(defalias 'magit-read-reuse-message #[513 "\300\301 \302\211\211\303\206 \304\305!\205 \305&\207" [magit-completing-read magit-list-refnames nil magit-revision-history magit-rev-verify "ORIG_HEAD"] 11 (#$ . 5210)])
|
#@145 Create a new commit on `HEAD'.
|
With a prefix argument, amend to the commit at `HEAD' instead.
|
|
(git commit [--amend] ARGS)
|
|
(fn &optional ARGS)
|
(defalias 'magit-commit-create #[256 "\302\235\203 \303\304!\211\262\205 \305 \306\307\")\207" [this-command default-directory "--all" magit-commit-all magit-commit-assert magit-toplevel magit-run-git-with-editor "commit"] 4 (#$ . 5470) (byte-code "\203\n \301\302 BC\207\302 C\207" [current-prefix-arg "--amend" magit-commit-arguments] 2)])
|
#@72 Amend the last commit.
|
|
(git commit --amend ARGS)
|
|
(fn &optional ARGS)
|
(defalias 'magit-commit-amend #[256 "\300 \210\301\302\303#\207" [magit-commit-amend-assert magit-run-git-with-editor "commit" "--amend"] 5 (#$ . 5971) (byte-code "\300 C\207" [magit-commit-arguments] 1)])
|
#@298 Amend the last commit, without editing the message.
|
|
With a prefix argument keep the committer date, otherwise change
|
it. The option `magit-commit-extend-override-date' can be used
|
to inverse the meaning of the prefix argument.
|
(git commit
|
--amend --no-edit)
|
|
(fn &optional ARGS OVERRIDE-DATE)
|
(defalias 'magit-commit-extend #[512 "\301?\"\211\262\205! \302 \210\211\204 \303\304!B\305\306\307\310$)\207" [process-environment magit-commit-assert magit-commit-amend-assert magit-rev-format "GIT_COMMITTER_DATE=%cD" magit-run-git-with-editor "commit" "--amend" "--no-edit"] 7 (#$ . 6256) (byte-code "\302 \203 ?\202\f D\207" [current-prefix-arg magit-commit-extend-override-date magit-commit-arguments] 2)])
|
#@377 Reword the last commit, ignoring staged changes.
|
|
With a prefix argument keep the committer date, otherwise change
|
it. The option `magit-commit-reword-override-date' can be used
|
to inverse the meaning of the prefix argument.
|
|
Non-interactively respect the optional OVERRIDE-DATE argument
|
and ignore the option.
|
|
(git commit --amend --only)
|
|
(fn &optional ARGS OVERRIDE-DATE)
|
(defalias 'magit-commit-reword #[512 "\301 \210\211\204 \302\303!B\304\305\306\307$)\207" [process-environment magit-commit-amend-assert magit-rev-format "GIT_COMMITTER_DATE=%cD" magit-run-git-with-editor "commit" "--amend" "--only"] 7 (#$ . 6985) (byte-code "\302 \203 ?\202\f D\207" [current-prefix-arg magit-commit-reword-override-date magit-commit-arguments] 2)])
|
#@242 Create a fixup commit.
|
|
With a prefix argument the target COMMIT has to be confirmed.
|
Otherwise the commit at point may be used without confirmation
|
depending on the value of option `magit-commit-squash-confirm'.
|
|
(fn &optional COMMIT ARGS)
|
(defalias 'magit-commit-fixup #[512 "\300\301#\207" [magit-commit-squash-internal "--fixup"] 6 (#$ . 7746) (byte-code "\300 \301 D\207" [magit-commit-at-point magit-commit-arguments] 2)])
|
#@279 Create a squash commit, without editing the squash message.
|
|
With a prefix argument the target COMMIT has to be confirmed.
|
Otherwise the commit at point may be used without confirmation
|
depending on the value of option `magit-commit-squash-confirm'.
|
|
(fn &optional COMMIT ARGS)
|
(defalias 'magit-commit-squash #[512 "\300\301#\207" [magit-commit-squash-internal "--squash"] 6 (#$ . 8184) (byte-code "\300 \301 D\207" [magit-commit-at-point magit-commit-arguments] 2)])
|
#@271 Create a squash commit, editing the squash message.
|
|
With a prefix argument the target COMMIT has to be confirmed.
|
Otherwise the commit at point may be used without confirmation
|
depending on the value of option `magit-commit-squash-confirm'.
|
|
(fn &optional COMMIT ARGS)
|
(defalias 'magit-commit-augment #[512 "\300\301\302\303%\207" [magit-commit-squash-internal "--squash" nil t] 8 (#$ . 8661) (byte-code "\300 \301 D\207" [magit-commit-at-point magit-commit-arguments] 2)])
|
#@90 Create a fixup commit targeting COMMIT and instantly rebase.
|
|
(fn &optional COMMIT ARGS)
|
(defalias 'magit-commit-instant-fixup #[512 "\300\301\302$\207" [magit-commit-squash-internal "--fixup" t] 7 (#$ . 9144) (byte-code "\300 \301 D\207" [magit-commit-at-point magit-commit-arguments] 2)])
|
#@91 Create a squash commit targeting COMMIT and instantly rebase.
|
|
(fn &optional COMMIT ARGS)
|
(defalias 'magit-commit-instant-squash #[512 "\300\301\302$\207" [magit-commit-squash-internal "--squash" t] 7 (#$ . 9443) (byte-code "\300 \301 D\207" [magit-commit-at-point magit-commit-arguments] 2)])
|
#@59
|
|
(fn OPTION COMMIT &optional ARGS REBASE EDIT CONFIRMED)
|
(defalias 'magit-commit-squash-internal #[1538 "C\306\307\"C\211\242\205\346 \203@ \242\203@ \310\311\"\204@ \312\313\314 \"\315P\316\"\211\317\267\202? \320\240\210\202? \320\262\202? \321\322!\210\210\203L \323\307\"\262\203\272 \204b \242\204\272 \204\272 \204\272 \320\211\324 Q\242B\240\210\204{ \211\325\242B\240\210\242\203\257 \326 \327=\203\217 \f\204\217 \330\202\220 012 2 3\331 \210\332\333\334\335\336\337\340\"\242\"#\210,\202\265 \341\333\242\"\210)\307\202\346 \342\343\344\345\346\347 $\350\"\351\352%\313\353 \354\320O\"\"\210\n\205\346 \307 4\355\356\320\357 #)\262\207" [current-prefix-arg magit-commit-squash-confirm magit-commit-show-diff system-type magit-cygwin-mount-points shell-file-name magit-commit-assert t magit-rev-ancestor-p "HEAD" read-char-choice format "%s isn't an ancestor of HEAD. " "[c]reate without rebasing, [s]elect other, [a]bort " (99 115 97) #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (99 46 115 53 97 59)) nil user-error "Quit" magit-rebase-interactive-assert "=" "--no-edit" -1 windows-nt "cmdproxy" with-editor--setup magit-call-git "commit" "--no-gpg-sign" -remove-first apply-partially string-match-p "\\`--gpg-sign=" magit-run-git-with-editor magit-log-select make-byte-code 257 "\304\300\303\242\301\242\302\305&\205\" \301\242\205\" \306!\210\307\310\311D\312\313\314\305&\207" vconcat vector [magit-commit-squash-internal t magit-commit-amend-assert magit-rebase-interactive-1 "--autosquash" "--autostash" "" "true" nil] 8 "\n\n(fn COMMIT)" "Type %%p on a commit to %s into it," 2 apply magit-diff-staged magit-diff-arguments magit-process-popup-time magit-with-editor-envvar process-environment with-editor--envvar magit-display-buffer-noselect] 18 (#$ . 9745)])
|
#@25
|
|
(fn &optional COMMIT)
|
(defalias 'magit-commit-amend-assert #[256 "\300!\211\205 \301\302\303\304\305Q\306Q\307%\266\202\207" [magit-list-publishing-branches "This commit has already been published to " ".\nDo you really want to modify it" magit-confirm amend-published "%s" "%i public branches" nil] 10 (#$ . 11621)])
|
#@30
|
|
(fn ARGS &optional STRICT)
|
(defalias 'magit-commit-assert #[513 "\302 \204 \303 \203 \304\235\204 \211\204' \305\235\204 \306\235\203' \206\217 \307C\207\310 \203@ \303 \204@ \311\312!\203@ \313\314\315\316\"\210\317\207\320\321\322!!\203T \303 \204T \206\217 \307C\207\303 \204] \323\324!\207 \203\214 \325=\203j \326 \210\311\327!\205| \330\331\332\333#\210\206| \307C \325=\203\213 \334\335!\203\217 \336 \210\207\323\337!\207" [this-command magit-commit-ask-to-stage magit-anything-staged-p magit-anything-unstaged-p "--all" "--amend" "--allow-empty" "--" magit-rebase-in-progress-p y-or-n-p "Nothing staged. Continue in-progress rebase? " magit-rebase-continue magit-run-git-sequencer "rebase" "--continue" nil file-exists-p magit-git-dir "MERGE_MSG" user-error "Nothing staged (or unstaged)" verbose magit-diff-unstaged "Nothing staged. Stage and commit all unstaged changes? " magit-run-git "add" "-u" "." derived-mode-p magit-diff-mode magit-mode-bury-buffer "Nothing staged"] 6 (#$ . 11955)])
|
(defvar magit--reshelve-history nil)
|
#@339 Change the committer date and possibly the author date of `HEAD'.
|
|
If you are the author of `HEAD', then both dates are changed,
|
otherwise only the committer date. The current time is used
|
as the initial minibuffer input and the original author (if
|
that is you) or committer date is available as the previous
|
history element.
|
|
(fn DATE)
|
(defalias 'magit-commit-reshelve #[257 "\301PB\302\303\304\305\306\307!\205 \310P$)\207" [process-environment "GIT_COMMITTER_DATE=" magit-run-git "commit" "--amend" "--no-edit" magit-rev-author-p "HEAD" "--date="] 7 (#$ . 13017) (byte-code "\301\302!\303\203\f \304\202 \305\302\306#B\307\203 \310\202 \311\312\313!\314B\300#C\207" [magit--reshelve-history magit-rev-author-p "HEAD" magit-rev-format "%ad" "%cd" "--date=format:%F %T %z" read-string "Change author and committer dates to: " "Change committer date to: " format-time-string "%F %T %z" 17] 5)])
|
#@190 Spread unstaged changes across recent commits.
|
Without a prefix argument just call `magit-commit-absorb'.
|
With a prefix argument use a popup buffer to select arguments.
|
|
(fn &optional ARG)
|
(defalias 'magit-commit-absorb-popup #[256 "\300\301\302#\207" [magit-invoke-popup magit-commit-absorb-popup nil] 5 (#$ . 13934) "P"])
|
(defvar magit-commit-absorb-popup (list :variable 'magit-commit-absorb-arguments :man-page "git-bisect" :options '((99 "Diff context lines" "--context=") (115 "Strictness" "--strict=")) :actions '((120 "Absorb" magit-commit-absorb)) :default-action 'magit-commit-absorb :use-prefix 'popup))
|
(byte-code "\300\301!\210\302\303\304\305\306DD\307\310\311\312\313&\207" [magit-define-popup-keys-deferred magit-commit-absorb-popup custom-declare-variable magit-commit-absorb-arguments funcall function #[0 "\301\302\"\207" [magit-commit-absorb-popup plist-get :default-arguments] 3] "" :group magit-git-arguments :type (repeat (string :tag "Argument"))] 8)
|
(defalias 'magit-commit-absorb-arguments #[0 "\303=\203 \207\n\207" [magit-current-popup magit-current-popup-args magit-commit-absorb-arguments magit-commit-absorb-popup] 2])
|
(put 'magit-commit-absorb-arguments 'definition-name 'magit-commit-absorb-popup)
|
#@200 Spread unstaged changes across recent commits.
|
This command requires the git-autofixup script, which is
|
available from https://github.com/torbiak/git-autofixup.
|
|
(fn &optional COMMIT ARGS CONFIRMED)
|
(defalias 'magit-commit-absorb #[768 "\300\301!\204 \302\303\304\"\210\305 \203 \302\306!\210\307 \204 \302\310!\210\203' \311\312\"\262\2039 \211\2039 \313\314\315$\210\312\207\316\317\320\321\322\323!\324\"\325\326%\327\211\211\211&\207" [executable-find "git-autofixup" user-error "This command requires the git-autofixup script, which %s" "is available from https://github.com/torbiak/git-autofixup" magit-anything-staged-p "Cannot absorb when there are staged changes" magit-anything-unstaged-p "There are no unstaged changes that could be absorbed" magit-rebase-interactive-assert t magit-run-git-async "autofixup" "-vv" magit-log-select make-byte-code 257 "\301\300\302#\207" vconcat vector [magit-commit-absorb t] 5 "\n\n(fn COMMIT)" nil] 10 (#$ . 15178) (byte-code "\300 \301 D\207" [magit-get-upstream-branch magit-commit-absorb-arguments] 2)])
|
(defalias 'magit-commit-diff #[0 "\205l \205l \306\307!\211\203 \310\311\"\210\210\3121j \313 @\314\315\311 \316\317!\210\320 \321\"\2034 \322\323\311\"\202J \320 \324\"\203B \322\325\311\"\202J \326 \327\"\205J \330\211\203T \211!\202c \331 \203` \323\311\"\202c \330!\262+\2620\207\210\311\207" [git-commit-mode magit-commit-show-diff inhibit-quit magit-display-buffer-noselect magit-inhibit-save-previous-winconf last-command magit-mode-get-buffer magit-diff-mode unrecord-window-buffer nil (quit) magit-diff-arguments unset t message "Diffing changes to be committed (C-g to abort diffing)" eql magit-commit apply-partially magit-diff-staged magit-commit-all magit-diff-working-tree memql (magit-commit-amend magit-commit-reword magit-rebase-reword-commit) magit-diff-while-amending magit-anything-staged-p] 5])
|
(byte-code "\301\302\303\"\210\304\305\306B\"\207" [git-commit-filename-regexp add-hook server-switch-hook magit-commit-diff add-to-list with-editor-server-window-alist switch-to-buffer] 4)
|
(defalias 'magit-commit-message-buffer #[0 "\302\303 \304\305\306\307 !\306 \"\302\310\203B \203B @\203# \304\262\2026 rq\210 \205. \303 )\232\2036 \211\262\210\211T\262A\262\202 \266\211\262)\207" [find-file-visit-truename git-commit-mode t magit-toplevel nil append buffer-list selected-frame 0] 8])
|
#@58 Used by `magit-commit-add-log' to insert a single entry.
|
(defvar magit-commit-add-log-insert-function 'magit-commit-add-log-insert (#$ . 17589))
|
#@223 Add a stub for the current change into the commit message buffer.
|
If no commit is in progress, then initiate it. Use the function
|
specified by variable `magit-commit-add-log-insert-function' to
|
actually insert the entry.
|
(defalias 'magit-commit-add-log #[0 "\301\302!\205 \303 \304 \305\211\306 \307\310\311\312\313!\314\"\315$\216\316\317!\210p\262`\262)\210\204F \320\305!\2044 \321\322!\210\323 \210\304 \211\262\204F \324\325!\210\2027 \212rq\210\211b\210\326 \205Y \327 #*\207" [magit-commit-add-log-insert-function magit-section-match hunk magit-current-section magit-commit-message-buffer nil current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 call-interactively magit-diff-visit-file magit-commit-assert user-error "Abort" magit-commit-create sit-for 0.01 magit-file-relative-name add-log-current-defun] 11 (#$ . 17741) nil])
|
#@26
|
|
(fn BUFFER FILE DEFUN)
|
(defalias 'magit-commit-add-log-insert #[771 "rq\210\301 \210db\210\302\303P\304\305#\204\n \214e`}\210\302\306\307\"\304\305#\2036 \310\311!\232\203/ \304\262\312\313!\210\202p \302\314\304\305#\203B \315\225b\210\312\316\304\305#\204B \211\203[ \306\317#c\210\304\262\202a \306\320\"c\210\321u\210\322\323!\204p \324c\210\321u\210\211\205\253 \304y\210\212\312\325\304\305#\205\201 `)\326\306\327\"\330 \"\206\225 \312\306\331\"\305#?\205\251 \312\316\305#\204\231 \306\332\"c\210\321u\262*\207" [comment-start undo-boundary re-search-backward "^" nil t format "* %s\\(?: (\\([^)]+\\))\\)?: " match-string 1 re-search-forward ": " "^[\\*(].+\n" 0 "^[^\\*\n].*\n" "* %s (%s): \n" "* %s: \n" -1 looking-at "\n[\n\\']" 10 "^\\*" looking-back "(%s): " line-beginning-position "^(%s): " "(%s): \n"] 8 (#$ . 18648)])
|
(provide 'magit-commit)
|
