;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\302\303\304\305\306DD\307\310\311\312\313\314\315& \207" [require magit custom-declare-variable magit-patch-save-arguments funcall function #[0 "\300\207" [(exclude "--stat")] 1] "Arguments used by `magit-patch-save-arguments' (which see)" :package-version (magit . "2.12.0") :group magit-diff :type (choice (const :tag "use buffer arguments" buffer) (cons :tag "use buffer arguments except" (const :format "" exclude) (repeat :format "%v%i\n" (string :tag "Argument"))) (repeat :tag "use constant arguments" (string :tag "Argument")))] 10)
|
#@55 Popup console for patch commands.
|
|
(fn &optional ARG)
|
(defalias 'magit-patch-popup #[256 "\300\301\302#\207" [magit-invoke-popup magit-patch-popup nil] 5 (#$ . 975) "P"])
|
(defvar magit-patch-popup (list :variable 'magit-patch-arguments :man-page "git-format-patch" :switches '("Switches for formatting patches" (108 "Add cover letter" "--cover-letter")) :options '("Options for formatting patches" (102 "From" "--from=") (116 "To" "--to=") (99 "CC" "--cc=") (114 "In reply to" "--in-reply-to=") (80 "Subject Prefix" "--subject-prefix=") (118 "Reroll count" "--reroll-count=") (115 "Thread style" "--thread=") (85 "Context lines" "-U") (77 "Detect renames" "-M") (67 "Detect copies" "-C") (65 "Diff algorithm" "--diff-algorithm=" magit-diff-select-algorithm) (111 "Output directory" "--output-directory=") (70 "Limit to files" "-- " magit-read-files)) :actions '((112 "Format patches" magit-format-patch) (114 "Request pull" magit-request-pull)) :default-action 'magit-format-patch))
|
(byte-code "\300\301!\210\302\303\304\305\306DD\307\310\311\312\313&\207" [magit-define-popup-keys-deferred magit-patch-popup custom-declare-variable magit-patch-arguments funcall function #[0 "\301\302\"\207" [magit-patch-popup plist-get :default-arguments] 3] "" :group magit-git-arguments :type (repeat (string :tag "Argument"))] 8)
|
(defalias 'magit-patch-arguments #[0 "\303=\203 \207\n\207" [magit-current-popup magit-current-popup-args magit-patch-arguments magit-patch-popup] 2])
|
(put 'magit-patch-arguments 'definition-name 'magit-patch-popup)
|
#@295 Create patches for the commits in RANGE.
|
When a single commit is given for RANGE, create a patch for the
|
changes introduced by that commit (unlike 'git format-patch'
|
which creates patches for all commits that are reachable from
|
`HEAD' but not from the specified commit).
|
|
(fn RANGE ARGS FILES)
|
(defalias 'magit-format-patch #[771 "\300\301\302%\210\303\235\205V \304\305\306\307 \310\311\312\203I \203I @\203, \310\262\202= \313\314\"\205; \305\315\316\"\"\262\210\211T\262A\262\202 \266\211\262\206R \211\262\"!\207" [magit-run-git "format-patch" "--" "--cover-letter" find-file expand-file-name "0000-cover-letter.patch" magit-toplevel nil t 0 string-match "--output-directory=\\(.+\\)" match-string 1] 16 (#$ . 2523) (byte-code "\301\302\303\"\211\203 \304!@\305@Q\2021 \306\307!\310\311\303\312#)\266\203\203* \211\202/ \313\314\211#\262\262\315\316 !B\207" [inhibit-changing-match-data magit-region-values commit t last "^.." magit-read-range-or-commit "Format range or commit" "\\.\\." nil string-match format "%s~..%s" magit-popup-export-file-args magit-patch-arguments] 9)])
|
#@319 Request upstream to pull from you public repository.
|
|
URL is the url of your publically accessible repository.
|
START is a commit that already is in the upstream repository.
|
END is the last commit, usually a branch name, which upstream
|
is asked to pull. START has to be reachable from that commit.
|
|
(fn URL START END)
|
(defalias 'magit-request-pull #[771 "\301 \210\302 \210\303\304$\210\305\306!\207" [default-directory compose-mail message-goto-body magit-git-insert "request-pull" set-buffer-modified-p nil] 8 (#$ . 3647) (byte-code "\300\301\302\303!\304#\305\306\307 \"\305\310!E\207" [magit-get "remote" magit-read-remote "Remote" "url" magit-read-branch-or-commit "Start" magit-get-upstream-branch "End"] 4)])
|
#@62 Popup console for applying a patch file.
|
|
(fn &optional ARG)
|
(defalias 'magit-patch-apply-popup #[256 "\300\301\302#\207" [magit-invoke-popup magit-patch-apply-popup nil] 5 (#$ . 4374) "P"])
|
(defvar magit-patch-apply-popup (list :variable 'magit-patch-apply-arguments :man-page "git-apply" :switches '((105 "Also apply to index" "--index") (99 "Only apply to index" "--cached") (51 "Fall back on 3way merge" "--3way")) :actions '((97 "Apply patch" magit-patch-apply)) :default-action 'magit-patch-apply))
|
(byte-code "\300\301!\210\302\303\304\305\306DD\307\310\311\312\313&\207" [magit-define-popup-keys-deferred magit-patch-apply-popup custom-declare-variable magit-patch-apply-arguments funcall function #[0 "\301\302\"\207" [magit-patch-apply-popup plist-get :default-arguments] 3] "" :group magit-git-arguments :type (repeat (string :tag "Argument"))] 8)
|
(defalias 'magit-patch-apply-arguments #[0 "\303=\203 \207\n\207" [magit-current-popup magit-current-popup-args magit-patch-apply-arguments magit-patch-apply-popup] 2])
|
(put 'magit-patch-apply-arguments 'definition-name 'magit-patch-apply-popup)
|
#@50 Apply the patch file FILE.
|
|
(fn FILE &rest ARGS)
|
(defalias 'magit-patch-apply #[385 "\300\301\302\303!$\207" [magit-run-git "apply" "--" magit-convert-filename-for-git] 8 (#$ . 5491) (byte-code "\301\302\303\304\211\305 \211\205 \306!\262%!\307 D\207" [default-directory expand-file-name read-file-name "Apply patch: " nil magit-file-at-point file-relative-name magit-patch-apply-arguments] 9)])
|
#@874 Write current diff into patch FILE.
|
|
What arguments are used to create the patch depends on the value
|
of `magit-patch-save-arguments' and whether a prefix argument is
|
used.
|
|
If the value is the symbol `buffer', then use the same arguments
|
as the buffer. With a prefix argument use no arguments.
|
|
If the value is a list beginning with the symbol `exclude', then
|
use the same arguments as the buffer except for those matched by
|
entries in the cdr of the list. The comparison is done using
|
`string-prefix-p'. With a prefix argument use the same arguments
|
as the buffer.
|
|
If the value is a list of strings (including the empty list),
|
then use those arguments. With a prefix argument use the same
|
arguments as the buffer.
|
|
Of course the arguments that are required to actually show the
|
same differences as those shown in the buffer are always used.
|
|
(fn FILE &optional ARG)
|
(defalias 'magit-patch-save #[513 "\302\303!\204\n \304\305!\210@A\211@A\211@A\211@A\n\302\306!\203- \307\310\211#\262 \311=\203> \f\203\\ \312\262\202\\ \242\313=\203T \f\204\\ \314 A\"\262\202\\ \f\204\\ \262 \315\316\317!!\320\321\322\323\324!\325\"\326$\216r\211q\210\327\330\331 \332\f&\210)r\211q\210\333\312\211\312\321%\210*\266\334 \207" [magit-refresh-args magit-patch-save-arguments derived-mode-p magit-diff-mode user-error "Only diff buffers can be saved as patches" magit-revision-mode format "%s~..%s" buffer nil exclude -difference get-buffer-create generate-new-buffer-name " *temp file*" make-byte-code 0 "\301\300!\205 \302\300!\207" vconcat vector [buffer-name kill-buffer] 2 magit-git-insert "diff" "-p" "--" write-region magit-refresh] 24 (#$ . 5901) (byte-code "\302\303\" D\207" [default-directory current-prefix-arg read-file-name "Write patch file: "] 3)])
|
(provide 'magit-patch)
|
