| 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 "\301\302!\210\301\303!\210\301\304!\210\301\305!\210\306\307\310\311\312\313\314\315&\210\316\317\320\321\322DD\323\314\307\324\325&\210\316\326\320\321\327DD\330\314\331\314\307\324\332& \210\316\333\320\321\334DD\335\336\337\314\307\324\325& \210\316\340\320\321\341DD\342\336\343\314\307\324\344& \210\316\345\320\321\346DD\347\336\350\314\307\324\351& \210\316\352\320\321\353DD\354\336\355\356\357\314\307\324\325\360\361& \210\316\362\320\321\363DD\364\336\365\314\307\324\351& \210\316\366\320\321\367DD\370\314\307\371\372\324\373& \210\374\366\375\376#\210\316\377\320\321\201@ DD\201A \336\201B \314\307\324\201C & \210\316\201D \320\321\201E DD\201F \314\307\371\201G \324\201H & \210\316\201I \320\321\201J DD\201K \314\307\371\201L \324\351& \210\316\201M \320\321\201N DD\201O \314\307\324\201P \201Q \201R \201S \201T \201U \201V \201W \201X \257\201Y BBBED&\210\316\201Z \320\321\201[ DD\201\\ \336\201] \314\307\324\351& \210\316\201^ \320\321\201_ DD\201` \336\201a \314\307\324\351& \210\316\201b \320\321\201c DD\201d \336\201e \314\307\324\351& \210\316\201f \320\321\201g DD\201h \336\201i \314\201j \314\307\324\351& \210\306\201k \310\201l \312\201m \314\315&\210\316\201n \320\321\201o DD\201p \314\201k \324\325\360\201q & \210\316\201r \320\321\201s DD\201t \336\201u \314\201k \324\325& \210\316\201v \320\321\201w DD\201x \336\201y \314\201k \324\201z & \210\316\201{ \320\321\201| DD\201} \336\201~ \314\201k \324\201 & \210\316\201\200 \320\321\201\201 DD\201\202 \336\201\203 \314\201k \324\201\204 & \210\316\201\205 \320\321\201\206 DD\201\207 \336\201\210 \314\201k \324\201\211 & \210\316\201\212 \320\321\201\213 DD\201\214 \336\201\215 \314\201k \324\351& \210\316\201\216 \320\321\201\217 DD\201\220 \336\201\221 \314\201k \324\201\222 & \210\316\201\223 \320\321\201\224 DD\201\225 \314\331\314\307\314\201\226 \324\201\227 & \210\374\201\223 \375\376#\210\201\230 \201\231 \201\232 \201\233 \314\201\234 %\210\201\230 \201\235 \201\236 \201\237 \314\201\234 %\210\201\230 \201\240 \201\241 \201\242 \314\201\234 %\210\201\230 \201\243 \201\244 \201\245 \314\201\234 %\210\201\230 \201\246 \201\247 \201\250 \314\201\234 %\210\201\230 \201\251 \201\252 \201\253 \314\201\234 %\210\201\230 \201\254 \201\255 \201\256 \314\201\234 %\210\201\230 \201\257 \201\260 \201\261 \314\201\234 %\210\201\230 \201\262 \201\263 \201\264 \314\201\234 %\210\201\230 \201\265 \201\266 \201\267 \314\201\234 %\210\201\230 \201\270 \201\271 \201\272 \314\201\234 %\210\201\230 \201\273 \201\274 \201\275 \314\201\234 %\210\201\230 \201\276 \201\277 \201\300 \314\201\234 %\210\201\230 \201\301 \201\302 \201\303 \314\201\234 %\210\201\230 \201\304 \201\305 \201\306 \314\201\234 %\210\201\230 \201\307 \201\310 \201\311 \314\201\234 %\210\201\230 \201\312 \201\313 \201\272 \314\201\234 %\210\201\230 \201\314 \201\315 \201\275 \314\201\234 %\210\201\230 \201\316 \201\317 \201\300 \314\201\234 %\210\201\230 \201\320 \201\321 \201\303 \314\201\234 %\210\201\230 \201\322 \201\323 \201\306 \314\201\234 %\210\201\230 \201\324 \201\325 \201\326 \314\201\234 %\210\201\230 \201\327 \201\330 \201\331 \314\201\234 %\210\201\230 \201\332 \201\333 \201\334 \314\201\234 %\210\201\230 \201\335 \201\336 \201\337 \314\201\234 %\207" [tab-width require git-commit magit-core diff-mode smerge-mode custom-declare-group magit-diff nil "Inspect and manipulate Git diffs." :link (info-link "(magit)Diffing") :group magit-modes custom-declare-variable magit-diff-mode-hook funcall function #[0 "\300\207" [nil] 1] "Hook run after entering Magit-Diff mode." :type hook magit-diff-arguments #[0 "\300\207" [("--stat" "--no-ext-diff")] 1] "The diff arguments used in buffers whose mode derives from `magit-diff-mode'." magit-git-arguments (repeat (string :tag "Argument")) magit-diff-sections-hook #[0 "\300\207" [(magit-insert-diff magit-insert-xref-buttons)] 1] "Hook run to insert sections into a `magit-diff-mode' buffer." :package-version (magit . "2.3.0") magit-diff-expansion-threshold #[0 "\300\207" [60] 1] "After how many seconds not to expand anymore diffs.\n\nExcept in status buffers, diffs are usually start out fully\nexpanded. Because that can take a long time, all diffs that\nhaven't been fontified during a refresh before the threshold\ndefined here are instead displayed with their bodies collapsed.\n\nNote that this can cause sections that were previously expanded\nto be collapsed. So you should not pick a very low value here.\n\nThe hook function `magit-diff-expansion-threshold' has to be a\nmember of `magit-section-set-visibility-hook' for this option\nto have any effect." (magit . "2.9.0") float magit-diff-highlight-hunk-body #[0 "\300\207" [t] 1] "Whether to highlight bodies of selected hunk sections.\nThis only has an effect if `magit-diff-highlight' is a\nmember of `magit-section-highlight-hook', which see." (magit . "2.1.0") boolean magit-diff-highlight-hunk-region-functions #[0 "\300\207" [(magit-diff-highlight-hunk-region-dim-outside magit-diff-highlight-hunk-region-using-overlays)] 1] "The functions used to highlight the hunk-internal region.\n\n`magit-diff-highlight-hunk-region-dim-outside' overlays the outside\nof the hunk internal selection with a face that causes the added and\nremoved lines to have the same background color as context lines.\nThis function should not be removed from the value of this option.\n\n`magit-diff-highlight-hunk-region-using-overlays' and\n`magit-diff-highlight-hunk-region-using-underline' emphasize the\nregion by placing delimiting horizonal lines before and after it.\nThe underline variant was implemented because Eli said that is\nhow we should do it. However the overlay variant actually works\nbetter. Also see https://github.com/magit/magit/issues/2758.\n\nInstead of, or in addition to, using delimiting horizontal lines,\nto emphasize the boundaries, you may which to emphasize the text\nitself, using `magit-diff-highlight-hunk-region-using-face'.\n\nIn terminal frames it's not possible to draw lines as the overlay\nand underline variants normally do, so there they fall back to\ncalling the face function instead." (magit . "2.9.0") :set-after (magit-diff-show-lines-boundaries) :options (magit-diff-highlight-hunk-region-dim-outside magit-diff-highlight-hunk-region-using-underline magit-diff-highlight-hunk-region-using-overlays magit-diff-highlight-hunk-region-using-face) magit-diff-unmarked-lines-keep-foreground #[0 "\300\207" [t] 1] "Whether `magit-diff-highlight-hunk-region-dim-outside' preserves foreground.\nWhen this is set to nil, then that function only adjusts the\nforeground color but added and removed lines outside the region\nkeep their distinct foreground colors." (magit . "2.9.0") magit-diff-refine-hunk #[0 "\300\207" [nil] 1] "Whether to show word-granularity differences within diff hunks.\n\nnil never show fine differences.\nt show fine differences for the current diff hunk only.\n`all' show fine differences for all displayed diff hunks." :safe #[257 "\211\300>\207" [(nil t all)] 3 "\n\n(fn VAL)"] (choice (const :tag "Never" nil) (const :tag "Current" t) (const :tag "All" all)) put permanent-local t magit-diff-adjust-tab-width #[0 "\300\207" [nil] 1] "Whether to adjust the width of tabs in diffs.\n\nDetermining the correct width can be expensive if it requires\nopening large and/or many files, so the widths are cached in\nthe variable `magit-diff--tab-width-cache'. Set that to nil\nto invalidate the cache.\n\nnil Never ajust tab width. Use `tab-width's value from\n the Magit buffer itself instead.\n\nt If the corresponding file-visiting buffer exits, then\n use `tab-width's value from that buffer. Doing this is\n cheap, so this value is used even if a corresponding\n cache entry exists.\n\n`always' If there is no such buffer, then temporarily visit the\n file to determine the value.\n\nNUMBER Like `always', but don't visit files larger than NUMBER\n bytes." (magit . "2.12.0") (choice (const :tag "Never" nil) (const :tag "If file-visiting buffer exists" t) (const :tag "... or file isn't larger than bytes" all) (const :tag "Always" always)) magit-diff-paint-whitespace #[0 "\300\207" [t] 1] "Specify where to highlight whitespace errors.\nSee `magit-diff-highlight-trailing',\n`magit-diff-highlight-indentation'. The symbol t means in all\ndiffs, `status' means only in the status buffer, and nil means\nnowhere." #[257 "\211\300>\207" [(t nil status)] 3 "\n\n(fn VAL)"] (choice (const :tag "Always" t) (const :tag "Never" nil) (const :tag "In status buffer" status)) magit-diff-highlight-trailing #[0 "\300\207" [t] 1] "Whether to highlight whitespace at the end of a line in diffs.\nUsed only when `magit-diff-paint-whitespace' is non-nil." booleanp magit-diff-highlight-indentation #[0 "\300\207" [nil] 1] "Highlight the \"wrong\" indentation style.\nUsed only when `magit-diff-paint-whitespace' is non-nil.\n\nThe value is a list of cons cells. The car is a regular\nexpression, and the cdr is the value that applies to repositories\nwhose directory matches the regular expression. If more than one\nelement matches, then the *last* element in the list applies.\nThe default value should therefore come first in the list.\n\nIf the value is `tabs', highlight indentation with tabs. If the\nvalue is an integer, highlight indentation with at least that\nmany spaces. Otherwise, highlight neither." repeat cons (string :tag "Directory regexp") choice (const :tag "Tabs" tabs) integer :tag "Spaces" :value ((const :tag "Neither" nil)) magit-diff-hide-trailing-cr-characters #[0 "\301>\205 \302\207" [system-type (ms-dos windows-nt) t] 2] "Whether to hide ^M characters at the end of a line in diffs." (magit . "2.6.0") magit-diff-visit-previous-blob #[0 "\300\207" [t] 1] "Whether `magit-diff-visit-file' may visit the previous blob.\n\nWhen this is t and point is on a removed line in a diff for a\ncommitted change, then `magit-diff-visit-file' visits the blob\nfrom the last revision which still had that line.\n\nCurrently this is only supported for committed changes, for\nstaged and unstaged changes `magit-diff-visit-file' always\nvisits the file in the working tree." (magit . "2.9.0") magit-diff-highlight-keywords #[0 "\300\207" [t] 1] "Whether to highlight bracketed keywords in commit messages." (magit . "2.12.0") magit-diff-buffer-file-locked #[0 "\300\207" [t] 1] "Whether `magit-diff-buffer-file' uses a dedicated buffer." (magit . "2.7.0") magit-commands magit-revision "Inspect and manipulate Git commits." (info-link "(magit)Revision Buffer") magit-revision-mode-hook #[0 "\300\207" [(bug-reference-mode)] 1] "Hook run after entering Magit-Revision mode." (bug-reference-mode) magit-revision-sections-hook #[0 "\300\207" [(magit-insert-revision-tag magit-insert-revision-headers magit-insert-revision-message magit-insert-revision-notes magit-insert-revision-diff magit-insert-xref-buttons)] 1] "Hook run to insert sections into a `magit-revision-mode' buffer." (magit . "2.3.0") magit-revision-headers-format #[0 "\300\207" [#1="Author: %aN <%aE>\nAuthorDate: %ad\nCommit: %cN <%cE>\nCommitDate: %cd\n"] 1 #1#] "Format string used to insert headers in revision buffers.\n\nAll headers in revision buffers are inserted by the section\ninserter `magit-insert-revision-headers'. Some of the headers\nare created by calling `git show --format=FORMAT' where FORMAT\nis the format specified here. Other headers are hard coded or\nsubject to option `magit-revision-insert-related-refs'." (magit . "2.3.0") string magit-revision-insert-related-refs #[0 "\300\207" [t] 1] "Whether to show related branches in revision buffers\n\n`nil' Don't show any related branches.\n`t' Show related local branches.\n`all' Show related local and remote branches.\n`mixed' Show all containing branches and local merged branches." (magit . "2.1.0") (choice (const :tag "don't" nil) (const :tag "local only" t) (const :tag "all related" all) (const :tag "all containing, local merged" mixed)) magit-revision-use-hash-sections #[0 "\300\207" [quicker] 1] "Whether to turn hashes inside the commit message into sections.\n\nIf non-nil, then hashes inside the commit message are turned into\n`commit' sections. There is a trade off to be made between\nperformance and reliability:\n\n- `slow' calls git for every word to be absolutely sure.\n- `quick' skips words less than seven characters long.\n- `quicker' additionally skips words that don't contain a number.\n- `quickest' uses all words that are at least seven characters\n long and which contain at least one number as well as at least\n one letter.\n\nIf nil, then no hashes are turned into sections, but you can\nstill visit the commit at point using \"RET\"." (magit . "2.12.0") (choice (const :tag "Use sections, quickest" quickest) (const :tag "Use sections, quicker" quicker) (const :tag "Use sections, quick" quick) (const :tag "Use sections, slow" slow) (const :tag "Don't use sections" nil)) magit-revision-show-gravatars #[0 "\300\207" [nil] 1] "Whether to show gravatar images in revision buffers.\n\nIf nil, then don't insert any gravatar images. If t, then insert\nboth images. If `author' or `committer', then insert only the\nrespective image.\n\nIf you have customized the option `magit-revision-header-format'\nand want to insert the images then you might also have to specify\nwhere to do so. In that case the value has to be a cons-cell of\ntwo regular expressions. The car specifies where to insert the\nauthor's image. The top half of the image is inserted right\nafter the matched text, the bottom half on the next line in the\nsame column. The cdr specifies where to insert the committer's\nimage, accordingly. Either the car or the cdr may be nil." (magit . "2.3.0") (choice (const :tag "Don't show gravatars" nil) (const :tag "Show gravatars" t) (const :tag "Show author gravatar" author) (const :tag "Show committer gravatar" committer) (cons :tag "Show gravatars using custom pattern." (regexp :tag "Author regexp" "^Author: ") (regexp :tag "Committer regexp" "^Commit: "))) magit-revision-use-gravatar-kludge #[0 "\300\207" [nil] 1] "Whether to work around a bug which affects display of gravatars.\n\nGravatar images are spliced into two halves which are then\ndisplayed on separate lines. On OS X the splicing has a bug in\nsome Emacs builds, which causes the top and bottom halves to be\ninterchanged. Enabling this option works around this issue by\ninterchanging the halves once more, which cancels out the effect\nof the bug.\n\nSee https://github.com/magit/magit/issues/2265\nand https://debbugs.gnu.org/cgi/bugreport.cgi?bug=7847.\n\nStarting with Emacs 26.1 this kludge should not be required for\nany build." (magit . "2.3.0") magit-revision-fill-summary-line #[0 "\300\207" [nil] 1] "Whether to fill excessively long summary lines.\n\nIf this is an integer, then the summary line is filled if it is\nlonger than either the limit specified here or `window-width'.\n\nYou may want to only set this locally in \".dir-locals-2.el\" for\nrepositories known to contain bad commit messages.\n\nThe body of the message is left alone because (a) most people who\nwrite excessively long summary lines usually don't add a body and\n(b) even people who have the decency to wrap their lines may have\na good reason to include a long line in the body sometimes." (magit . "2.90.0") (choice (const :tag "Don't fill" nil) (integer :tag "Fill if longer than")) magit-diff-section-arguments #[0 "\300\207" [("--no-ext-diff")] 1] "The diff arguments used in buffers that show other things besides diffs." magit-status (repeat (string :tag "Argument")) custom-declare-face magit-diff-file-heading ((t :weight bold)) "Face for diff file headings." magit-faces magit-diff-file-heading-highlight ((t :inherit (magit-section-highlight))) "Face for current diff file headings." magit-diff-file-heading-selection ((((class color) (background light)) :inherit magit-diff-file-heading-highlight :foreground "salmon4") (((class color) (background dark)) :inherit magit-diff-file-heading-highlight :foreground "LightSalmon3")) "Face for selected diff file headings." magit-diff-hunk-heading ((((class color) (background light)) :background "grey80" :foreground "grey30") (((class color) (background dark)) :background "grey25" :foreground "grey70")) "Face for diff hunk headings." magit-diff-hunk-heading-highlight ((((class color) (background light)) :background "grey75" :foreground "grey30") (((class color) (background dark)) :background "grey35" :foreground "grey70")) "Face for current diff hunk headings." magit-diff-hunk-heading-selection ((((class color) (background light)) :inherit magit-diff-hunk-heading-highlight :foreground "salmon4") (((class color) (background dark)) :inherit magit-diff-hunk-heading-highlight :foreground "LightSalmon3")) "Face for selected diff hunk headings." magit-diff-hunk-region ((t :inherit bold)) "Face used by `magit-diff-highlight-hunk-region-using-face'.\n\nThis face is overlayed over text that uses other hunk faces,\nand those normally set the foreground and background colors.\nThe `:foreground' and especially the `:background' properties\nshould be avoided here. Setting the latter would cause the\nlose of information. Good properties to set here are `:weight'\nand `:slant'." magit-diff-lines-heading ((((class color) (background light)) :inherit magit-diff-hunk-heading-highlight :background "LightSalmon3") (((class color) (background dark)) :inherit magit-diff-hunk-heading-highlight :foreground "grey80" :background "salmon4")) "Face for diff hunk heading when lines are marked." magit-diff-lines-boundary ((t :inherit magit-diff-lines-heading)) "Face for boundary of marked lines in diff hunk." magit-diff-conflict-heading ((t :inherit magit-diff-hunk-heading)) "Face for conflict markers." magit-diff-added ((((class color) (background light)) :background "#ddffdd" :foreground "#22aa22") (((class color) (background dark)) :background "#335533" :foreground "#ddffdd")) "Face for lines in a diff that have been added." magit-diff-removed ((((class color) (background light)) :background "#ffdddd" :foreground "#aa2222") (((class color) (background dark)) :background "#553333" :foreground "#ffdddd")) "Face for lines in a diff that have been removed." magit-diff-our ((t :inherit magit-diff-removed)) "Face for lines in a diff for our side in a conflict." magit-diff-base ((((class color) (background light)) :background "#ffffcc" :foreground "#aaaa11") (((class color) (background dark)) :background "#555522" :foreground "#ffffcc")) "Face for lines in a diff for the base side in a conflict." magit-diff-their ((t :inherit magit-diff-added)) "Face for lines in a diff for their side in a conflict." magit-diff-context ((((class color) (background light)) :foreground "grey50") (((class color) (background dark)) :foreground "grey70")) "Face for lines in a diff that are unchanged." magit-diff-added-highlight ((((class color) (background light)) :background "#cceecc" :foreground "#22aa22") (((class color) (background dark)) :background "#336633" :foreground "#cceecc")) magit-diff-removed-highlight ((((class color) (background light)) :background "#eecccc" :foreground "#aa2222") (((class color) (background dark)) :background "#663333" :foreground "#eecccc")) magit-diff-our-highlight ((t :inherit magit-diff-removed-highlight)) magit-diff-base-highlight ((((class color) (background light)) :background "#eeeebb" :foreground "#aaaa11") (((class color) (background dark)) :background "#666622" :foreground "#eeeebb")) magit-diff-their-highlight ((t :inherit magit-diff-added-highlight)) magit-diff-context-highlight ((((class color) (background light)) :background "grey95" :foreground "grey50") (((class color) (background dark)) :background "grey20" :foreground "grey70")) "Face for lines in the current context in a diff." magit-diff-whitespace-warning ((t :inherit trailing-whitespace)) "Face for highlighting whitespace errors added lines." magit-diffstat-added ((((class color) (background light)) :foreground "#22aa22") (((class color) (background dark)) :foreground "#448844")) "Face for plus sign in diffstat." magit-diffstat-removed ((((class color) (background light)) :foreground "#aa2222") (((class color) (background dark)) :foreground "#aa4444")) "Face for minus sign in diffstat."] 17) | |
| 16 | (defconst magit-diff-popup-common-keywords '(:variable magit-diff-arguments :man-page "git-diff")) | |
| 17 | (defconst magit-diff-popup-common-options '((102 "Limit to files" "-- " magit-read-files) (117 "Context lines" "-U") (109 "Detect renames" "-M") (99 "Detect copies" "-C") (97 "Diff algorithm" "--diff-algorithm=" magit-diff-select-algorithm) (105 "Ignore submodules" "--ignore-submodules=" magit-diff-select-ignore-submodules))) | |
| 18 | (defconst magit-diff-popup-common-switches '((102 "Show surrounding functions" "--function-context") (98 "Ignore whitespace changes" "--ignore-space-change") (119 "Ignore all whitespace" "--ignore-all-space") (120 "Disallow external diff drivers" "--no-ext-diff"))) | |
| 19 | (defvar magit-diff-popup (byte-code "\303\304 \305\303\n\306\"\307BBBB\"\207" [magit-diff-popup-common-keywords magit-diff-popup-common-options magit-diff-popup-common-switches append :options :switches ((115 "Show stats" "--stat")) (:actions ((100 "Dwim" magit-diff-dwim) (117 "Diff unstaged" magit-diff-unstaged) (99 "Show commit" magit-show-commit) (114 "Diff range" magit-diff-range) (115 "Diff staged" magit-diff-staged) (116 "Show stash" magit-stash-show) (112 "Diff paths" magit-diff-paths) (119 "Diff worktree" magit-diff-working-tree)) :default-action magit-diff-dwim :max-action-columns 3)] 8)) | |
| 20 | (defvar magit-diff-refresh-popup (byte-code "\303\304 \305\n\306BBBB\"\207" [magit-diff-popup-common-keywords magit-diff-popup-common-options magit-diff-popup-common-switches append :options :switches (:actions ((103 "Refresh" magit-diff-refresh) (116 "Toggle hunk refinement" magit-diff-toggle-refine-hunk) (115 "Set defaults" magit-diff-set-default-arguments) (70 "Toggle file filter" magit-diff-toggle-file-filter) (119 "Save defaults" magit-diff-save-default-arguments)) :max-action-columns 2)] 7)) | |
| 21 | (defvar magit-diff-mode-refresh-popup (byte-code "\303\304 \305\303\n\306\"\307BBBB\"\207" [magit-diff-popup-common-keywords magit-diff-popup-common-options magit-diff-popup-common-switches append :options :switches ((115 "Show stats" "--stat")) (:actions ((103 "Refresh" magit-diff-refresh) (116 "Toggle hunk refinement" magit-diff-toggle-refine-hunk) (115 "Set defaults" magit-diff-set-default-arguments) (114 "Switch range type" magit-diff-switch-range-type) (119 "Save defaults" magit-diff-save-default-arguments) (102 "Flip revisions" magit-diff-flip-revs) nil (70 "Toggle file filter" magit-diff-toggle-file-filter)) :max-action-columns 2)] 8)) | |
| 22 | (defvar magit-revision-mode-refresh-popup (byte-code "\303\304 \305\303\n\306\"\307BBBB\"\207" [magit-diff-popup-common-keywords magit-diff-popup-common-options magit-diff-popup-common-switches append :options :switches ((115 "Show stats" "--stat")) (:actions ((103 "Refresh" magit-diff-refresh) (116 "Toggle hunk refinement" magit-diff-toggle-refine-hunk) (115 "Set defaults" magit-diff-set-default-arguments) (70 "Toggle file filter" magit-diff-toggle-file-filter) (119 "Save defaults" magit-diff-save-default-arguments)) :max-action-columns 2)] 8)) | |
| 23 | (byte-code "\300\301!\210\300\302!\210\300\303!\210\300\304!\207" [magit-define-popup-keys-deferred magit-diff-popup magit-diff-refresh-popup magit-diff-mode-refresh-popup magit-revision-mode-refresh-popup] 2) | |
| 24 | (defvar magit-diff-section-file-args nil) | |
| 25 | (byte-code "\300\301\302\303#\210\300\301\304\305#\207" [put magit-diff-section-file-args permanent-local t safe-local-variable #[257 "\211<\205 \300\301\"\207" [-all-p stringp] 4 "\n\n(fn VAL)"]] 4) | |
| 26 | (defalias 'magit-diff-get-buffer-args #[0 "\203 \302\303!\203 \304 8\305 8D\207\306=\2030 \307\303!\211\205+ r\211q\210\304 8\305 8)D\262\2065 \310\311!\312D\207" [magit-use-sticky-arguments magit-refresh-args derived-mode-p magit-diff-mode 2 3 t magit-mode-get-buffer default-value magit-diff-arguments nil] 4]) | |
| 27 | #@26 | |
| 28 | ||
| 29 | (fn &optional REFRESH) | |
| 30 | (defalias 'magit-diff-arguments #[256 "\304>\203\n \305 !\207\211\203 \306\307!\204 \n D\207\310 \207" [magit-current-popup magit-current-popup-args magit-diff-section-arguments magit-diff-section-file-args (magit-diff-popup magit-diff-refresh-popup) magit-popup-export-file-args derived-mode-p magit-diff-mode magit-diff-get-buffer-args] 3 (#$ . 24622)]) | |
| 31 | #@44 Popup console for diff commands. | |
| 32 | ||
| 33 | (fn ARG) | |
| 34 | (defalias 'magit-diff-popup #[257 "\301\302\303 \"\304\305\306#)\207" [magit-diff-arguments apply magit-popup-import-file-args magit-diff-get-buffer-args magit-invoke-popup magit-diff-popup nil] 5 (#$ . 25012) "P"]) | |
| 35 | #@177 Popup console for diff commands. | |
| 36 | ||
| 37 | This is a variant of `magit-diff-popup' which shows the same popup | |
| 38 | but which limits the diff to the file being visited in the current | |
| 39 | buffer. | |
| 40 | (defalias 'magit-diff-buffer-file-popup #[0 "\302 \211\203+ \303\304\305!\211\203 r\211q\210\3068)\202 \307\301!\262C\"\310\311\312\211#)\202. \313\314!\207" [magit-refresh-args magit-diff-arguments magit-file-relative-name magit-popup-import-file-args magit-mode-get-buffer magit-diff-mode 3 default-value magit-invoke-popup magit-diff-popup nil user-error "Buffer isn't visiting a file"] 5 (#$ . 25280) nil]) | |
| 41 | #@76 Popup console for changing diff arguments in the current buffer. | |
| 42 | ||
| 43 | (fn ARG) | |
| 44 | (defalias 'magit-diff-refresh-popup #[257 "\306\267\202 \202 \n\202 \307\310!\203 \311\312\f8\313\f8\"\202% \311 \" \314\303\315#*\207" [major-mode magit-revision-mode-refresh-popup magit-diff-mode-refresh-popup magit-diff-refresh-popup magit-refresh-args magit-diff-section-arguments #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (magit-revision-mode 6 magit-diff-mode 10)) derived-mode-p magit-diff-mode magit-popup-import-file-args 2 3 magit-invoke-popup nil magit-diff-section-file-args magit-diff-arguments] 6 (#$ . 25879) "P"]) | |
| 45 | #@21 | |
| 46 | ||
| 47 | (fn &rest IGNORE) | |
| 48 | (defalias 'magit-diff-select-algorithm #[128 "\300\301\302\"\211\303\267\202 \304\202 \305\202 \306\202 \307\202 \310\207" [read-char-choice "[d]efault, [m]inimal, [p]atience, [h]istogram, or [C-g] to abort " (100 109 112 104) #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (100 10 109 14 112 18 104 22)) "default" "minimal" "patience" "histogram" nil] 4 (#$ . 26545)]) | |
| 49 | #@22 | |
| 50 | ||
| 51 | (fn &rest IGNORED) | |
| 52 | (defalias 'magit-diff-select-ignore-submodules #[128 "\300\301\302\"\211\303\267\202 \304\202 \305\202 \306\202 \307\207" [read-char-choice "Ignore submodules [u]ntracked, [d]irty, [a]ll, or [C-g] to abort " (117 100 97) #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (117 10 100 14 97 18)) "untracked" "dirty" "all" nil] 4 (#$ . 26984)]) | |
| 53 | #@65 Show changes for the thing at point. | |
| 54 | ||
| 55 | (fn &optional ARGS FILES) | |
| 56 | (defalias 'magit-diff-dwim #[512 "\300 \301\302=\203 \303\"\202\225 \304=\203 \305\"\202\225 \306=\203H \307 \211\203< \310!@AA\311\232\203< \303C\"\202C \312\313#\262\202\225 :\203\201 @\211\314\267\202y A\211\315\316\317\211##\262\262\202| A\211\320\"\262\262\202| \321\315!\262\202\225 ;\203\223 \315#\262\202\225 \211 \207" [magit-diff--dwim #[0 "\300\301!\207" [call-interactively magit-diff-range] 2] unmerged magit-diff-unmerged unstaged magit-diff-unstaged staged magit-file-at-point magit-file-status (68 85) magit-diff-staged nil #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (commit 85 stash 106)) magit-diff-range format "%s^..%s" magit-stash-show call-interactively] 12 (#$ . 27392) (magit-diff-arguments)]) | |
| 57 | #@568 Return information for performing DWIM diff. | |
| 58 | ||
| 59 | The information can be in three forms: | |
| 60 | 1. TYPE | |
| 61 | A symbol describing a type of diff where no additional information | |
| 62 | is needed to generate the diff. Currently, this includes `staged', | |
| 63 | `unstaged' and `unmerged'. | |
| 64 | 2. (TYPE . VALUE) | |
| 65 | Like #1 but the diff requires additional information, which is | |
| 66 | given by VALUE. Currently, this includes `commit' and `stash', | |
| 67 | where VALUE is the given commit or stash, respectively. | |
| 68 | 3. RANGE | |
| 69 | A string indicating a diff range. | |
| 70 | ||
| 71 | If no DWIM context is found, nil is returned. | |
| 72 | (defalias 'magit-diff--dwim #[0 "\302\303\304\"\211\205 \305 \210\306!@\307@Q\262\206;\203 \310B\207\311\312!\203i \310\313 \211\203; \314\310\"\203; \315\316\"\202e \211\203P \314\317\"\203P \315\211\320\"\316\"\202e \211\205e \314\321\"\205e \315\211\211\320\"\320\"\316\"\262B\207\311\322!\203t \310 @B\207\311\323!\203} @\207\313 \211\203\216 \314\324\"\203\216 \325\2029\211\203\235 \314\326\"\203\235 \327\2029\211\203\254 \314\330\"\203\254 \330\2029\211\203\276 \314\331\"\203\276 \315\316\"\2029\211\203\320 \314\332\"\203\320 \315\316\"\2029\211\203\314\333\"\203\334 \315\316\"\211\232\203\335 \211\203\365 \336\337#\202\340 \203\376 \202\310B\262\202\336\337\206 \341#\266\202\2029\211\203(\314\310\"\203(\310\315\316\"B\2029\211\2059\314\342\"\2059\342\315\316\"B\262\207" [magit-buffer-refname magit-refresh-args magit-region-values (commit branch) t deactivate-mark last ".." commit derived-mode-p magit-stash-mode magit-current-section magit-section-match-1 eieio-oref value file parent hunk magit-revision-mode magit-diff-mode [* unstaged] unstaged [* staged] staged unmerged unpushed unpulled branch magit-get-current-branch magit-get-upstream-branch format "%s...%s" magit-anything-modified-p "HEAD" stash] 8 (#$ . 28265)]) | |
| 73 | #@243 Read range or revision with special diff range treatment. | |
| 74 | If MBASE is non-nil, prompt for which rev to place at the end of | |
| 75 | a "revA...revB" range. Otherwise, always construct | |
| 76 | "revA..revB" range. | |
| 77 | ||
| 78 | (fn PROMPT &optional SECONDARY-DEFAULT MBASE) | |
| 79 | (defalias 'magit-diff-read-range-or-commit #[769 "\300\301\302\"\211\203g \303!@@\304 \210\203] \305\306#\307!\230\203* \310\311#\202X \307!\230\203: \310\311#\202X \312\313D\314\302\314\211&\310\315\230\203S \202T #\262\262\202b \310\311#\266\202\202\242 \316\317 \211:\203\211 \211@\211\320=\205\204 A\211\310\321\211#\262\262\262\202\226 \211;\203\225 \211\211\262\202\226 \314\262\206\241 \206\241 \322 \"\207" [magit-region-values (commit branch) t last deactivate-mark magit-git-string "merge-base" magit-rev-parse format "%s..%s" magit-completing-read "View changes along" nil "%s...%s" magit-read-range magit-diff--dwim commit "%s^..%s" magit-get-current-branch] 15 (#$ . 30144)]) | |
| 80 | #@38 | |
| 81 | ||
| 82 | (fn REV-OR-RANGE CONST ARGS FILES) | |
| 83 | (defalias 'magit-diff-setup #[1028 "\300\301!\210\302\303%\207" [require magit magit-mode-setup magit-diff-mode] 10 (#$ . 31117)]) | |
| 84 | #@595 Show differences between two commits. | |
| 85 | ||
| 86 | REV-OR-RANGE should be a range or a single revision. If it is a | |
| 87 | revision, then show changes in the working tree relative to that | |
| 88 | revision. If it is a range, but one side is omitted, then show | |
| 89 | changes relative to `HEAD'. | |
| 90 | ||
| 91 | If the region is active, use the revisions on the first and last | |
| 92 | line of the region as the two sides of the range. With a prefix | |
| 93 | argument, instead of diffing the revisions, choose a revision to | |
| 94 | view changes along, starting at the common ancestor of both | |
| 95 | revisions (i.e., use a "..." range). | |
| 96 | ||
| 97 | (fn REV-OR-RANGE &optional ARGS FILES) | |
| 98 | (defalias 'magit-diff-range #[769 "\300\301$\207" [magit-diff-setup nil] 8 (#$ . 31296) (byte-code "\301\302\303#\304 B\207" [current-prefix-arg magit-diff-read-range-or-commit "Diff for range" nil magit-diff-arguments] 4)]) | |
| 99 | #@201 Show changes between the current working tree and the `HEAD' commit. | |
| 100 | With a prefix argument show changes between the working tree and | |
| 101 | a commit read from the minibuffer. | |
| 102 | ||
| 103 | (fn &optional REV ARGS FILES) | |
| 104 | (defalias 'magit-diff-working-tree #[768 "\300\206 \301\302$\207" [magit-diff-setup "HEAD" nil] 8 (#$ . 32126) (byte-code "\205 \301\302!\303 B\207" [current-prefix-arg magit-read-branch-or-commit "Diff working tree and commit" magit-diff-arguments] 2)]) | |
| 105 | #@179 Show changes between the index and the `HEAD' commit. | |
| 106 | With a prefix argument show changes between the index and | |
| 107 | a commit read from the minibuffer. | |
| 108 | ||
| 109 | (fn &optional REV ARGS FILES) | |
| 110 | (defalias 'magit-diff-staged #[768 "\300\301C$\207" [magit-diff-setup "--cached"] 8 (#$ . 32594) (byte-code "\205 \301\302!\303 B\207" [current-prefix-arg magit-read-branch-or-commit "Diff index and commit" magit-diff-arguments] 2)]) | |
| 111 | #@81 Show changes between the working tree and the index. | |
| 112 | ||
| 113 | (fn &optional ARGS FILES) | |
| 114 | (defalias 'magit-diff-unstaged #[512 "\300\301\211$\207" [magit-diff-setup nil] 7 (#$ . 33017) (magit-diff-arguments)]) | |
| 115 | #@64 Show changes that are being merged. | |
| 116 | ||
| 117 | (fn &optional ARGS FILES) | |
| 118 | (defalias 'magit-diff-unmerged #[512 "\300 \204 \301\302!\210\303\304 \305$\207" [magit-merge-in-progress-p user-error "No merge is in progress" magit-diff-setup magit--merge-range nil] 7 (#$ . 33225) (magit-diff-arguments)]) | |
| 119 | #@220 While committing, show the changes that are about to be committed. | |
| 120 | While amending, invoking the command again toggles between | |
| 121 | showing just the new changes or all the changes that will | |
| 122 | be committed. | |
| 123 | ||
| 124 | (fn &optional ARGS) | |
| 125 | (defalias 'magit-diff-while-committing #[256 "\302 \204 \303\304!\210\305\306\307!\211\203e \310!\203e r\211q\210 @ A\211@\211\211\311\232\2039 \312\232\2039 \313\314 \"\202] \211\314\232\203L \315\232\203L \316!\202] \317 \203Y \313\314 \"\202] \316!\266\202\266\203)\202t \317 \203q \313\314\"\202t \316!)\207" [magit-display-buffer-noselect magit-refresh-args magit-commit-message-buffer user-error "No commit in progress" t magit-mode-get-buffer magit-diff-mode get-buffer-window "HEAD^" ("--cached") magit-diff-staged nil ("--cached") magit-diff-while-amending magit-anything-staged-p] 11 (#$ . 33524) (byte-code "\300 @C\207" [magit-diff-arguments] 1)]) | |
| 126 | (define-key git-commit-mode-map "" 'magit-diff-while-committing) | |
| 127 | #@23 | |
| 128 | ||
| 129 | (fn &optional ARGS) | |
| 130 | (defalias 'magit-diff-while-amending #[256 "\300\301\302C\303$\207" [magit-diff-setup "HEAD^" "--cached" nil] 6 (#$ . 34491)]) | |
| 131 | #@63 Show diff for the blob or file visited in the current buffer. | |
| 132 | (defalias 'magit-diff-buffer-file #[0 "\302\303!\210\304 \211\203# \305\306\206 \307 \206 \310\311\312 A@CF #\202& \313\314!\207" [magit-buffer-refname magit-diff-buffer-file-locked require magit magit-file-relative-name magit-mode-setup-internal magit-diff-mode magit-get-current-branch "HEAD" nil magit-diff-arguments user-error "Buffer isn't visiting a file"] 7 (#$ . 34647) nil]) | |
| 133 | #@55 Show changes between any two files on disk. | |
| 134 | ||
| 135 | (fn A B) | |
| 136 | (defalias 'magit-diff-paths #[514 "\300\301\302C\301\303\304!!\303\304!!D$\207" [magit-diff-setup nil "--no-index" magit-convert-filename-for-git expand-file-name] 10 (#$ . 35103) (byte-code "\300\301\302\211\303$\300\304\302\211\303$D\207" [read-file-name "First file: " nil t "Second file: "] 6)]) | |
| 137 | (defvar magit-buffer-revision-hash nil nil) | |
| 138 | (make-variable-buffer-local 'magit-buffer-revision-hash) | |
| 139 | (defalias 'magit-show-commit--arguments #[0 "\301 \211@A\211@A\211\302\303!\203\" \304A@\235?\205# \3058\202# D\266\202\207" [magit-refresh-args magit-diff-arguments derived-mode-p magit-log-mode "--follow" 2] 10]) | |
| 140 | #@168 Visit the revision at point in another buffer. | |
| 141 | If there is no revision at point or with a prefix argument prompt | |
| 142 | for a revision. | |
| 143 | ||
| 144 | (fn REV &optional ARGS FILES MODULE) | |
| 145 | (defalias 'magit-show-commit #[1025 "\301\302!\210\303 \211\2030 \211\203 \304\305!!\306!\204\" \307\310\"\210\311\312\313%)\2022 \314 \207" [default-directory require magit magit-toplevel expand-file-name file-name-as-directory magit-rev-verify-commit user-error "%s is not a commit" magit-mode-setup magit-revision-mode nil magit--not-inside-repository-error] 11 (#$ . 35791) (byte-code "\302\303!\304\300!\203 \203 \305\306 \307\"\206 \211\206 \310 \311 \211@A\211@A \2040 \2065 \312\313 \" \205@ \314\315 !F\266\202\207" [magit-blame-mode current-prefix-arg magit-section-value-if module-commit boundp eieio-oref magit-current-blame-chunk orig-rev magit-branch-or-commit-at-point magit-show-commit--arguments magit-read-branch-or-commit "Show commit" magit-section-parent-value magit-current-section] 14)]) | |
| 146 | #@71 Set the local diff arguments for the current buffer. | |
| 147 | ||
| 148 | (fn ARGS FILES) | |
| 149 | (defalias 'magit-diff-refresh #[514 "\303\304!\203 AD\241\210\202 \305\301!\210\305\302!\210\211\306 \207" [magit-refresh-args magit-diff-section-arguments magit-diff-section-file-args derived-mode-p magit-diff-mode make-local-variable magit-refresh] 5 (#$ . 36804) (magit-diff-arguments t)]) | |
| 150 | #@72 Set the global diff arguments for the current buffer. | |
| 151 | ||
| 152 | (fn ARGS FILES) | |
| 153 | (defalias 'magit-diff-set-default-arguments #[514 "\301\302!\203 \303\304\"\210AD\241\210\202\" \303\305\"\210\306\305!\210\306\307!\210\310 \207" [magit-refresh-args derived-mode-p magit-diff-mode customize-set-variable magit-diff-arguments magit-diff-section-arguments kill-local-variable magit-diff-section-file-args magit-refresh] 5 (#$ . 37181) (magit-diff-arguments t)]) | |
| 154 | #@81 Set and save the global diff arguments for the current buffer. | |
| 155 | ||
| 156 | (fn ARGS FILES) | |
| 157 | (defalias 'magit-diff-save-default-arguments #[514 "\301\302!\203 \303\304\"\210AD\241\210\202\" \303\305\"\210\306\305!\210\306\307!\210\310 \207" [magit-refresh-args derived-mode-p magit-diff-mode customize-save-variable magit-diff-arguments magit-diff-section-arguments kill-local-variable magit-diff-section-file-args magit-refresh] 5 (#$ . 37641) (magit-diff-arguments t)]) | |
| 158 | #@79 Convert diff range type. | |
| 159 | Change "revA..revB" to "revB...revA", or vice versa. | |
| 160 | (defalias 'magit-diff-switch-range-type #[0 "@\211\2032 \302\303!\2032 \304 \"\2032 \305\306\"\305\307\"\310\230\203% \311\202& \310\305\312\"Q\240\210\313 \2025 \314\315!\207" [magit-refresh-args magit-range-re derived-mode-p magit-diff-mode string-match match-string 1 2 ".." "..." 3 magit-refresh user-error "No range to change"] 7 (#$ . 38112) nil]) | |
| 161 | #@68 Swap revisions in diff range. | |
| 162 | Change "revA..revB" to "revB..revA". | |
| 163 | (defalias 'magit-diff-flip-revs #[0 "@\211\203( \302\303!\203( \304 \"\203( \305\306\"\305\307\"\305\310\"Q\240\210\311 \202+ \312\313!\207" [magit-refresh-args magit-range-re derived-mode-p magit-diff-mode string-match match-string 3 2 1 magit-refresh user-error "No range to swap"] 7 (#$ . 38556) nil]) | |
| 164 | (defvar magit-diff--last-file-args nil nil) | |
| 165 | (make-variable-buffer-local 'magit-diff--last-file-args) | |
| 166 | #@14 | |
| 167 | ||
| 168 | (fn FILES) | |
| 169 | (defalias 'magit-diff--toggle-file-args #[257 "\211\203 \211\301\207\206 \302\303!\207" [magit-diff--last-file-args nil user-error "No diff file filter to toggle"] 3 (#$ . 39041)]) | |
| 170 | #@196 Toggle the file restriction of the current buffer's diffs. | |
| 171 | If the current buffer's mode is derived from `magit-log-mode', | |
| 172 | toggle the file restriction in the repository's revision buffer | |
| 173 | instead. | |
| 174 | (defalias 'magit-diff-toggle-file-filter #[0 "\302\303!\205 \304\305!\211\203# r\211q\210\306\233\211\307\3068!\240\266\310 )\202B \302\311!\2038 \306\233\211\307\3068!\240\266\202@ \312\301!\210\307 !\310 \207" [magit-refresh-args magit-diff-section-file-args derived-mode-p magit-log-mode magit-mode-get-buffer magit-revision-mode 3 magit-diff--toggle-file-args magit-refresh magit-diff-mode make-local-variable] 6 (#$ . 39246) nil]) | |
| 175 | #@75 Decrease the context for diff hunks by COUNT lines. | |
| 176 | ||
| 177 | (fn &optional COUNT) | |
| 178 | (defalias 'magit-diff-less-context #[256 "\300\301\302\303\304\305\306EEE!\207" [magit-diff-set-context lambda (cur) max 0 - (or cur 0)] 9 (#$ . 39891) "p"]) | |
| 179 | #@75 Increase the context for diff hunks by COUNT lines. | |
| 180 | ||
| 181 | (fn &optional COUNT) | |
| 182 | (defalias 'magit-diff-more-context #[256 "\300\301\302\303\304EE!\207" [magit-diff-set-context lambda (cur) + (or cur 0)] 7 (#$ . 40131) "p"]) | |
| 183 | #@53 Reset context for diff hunks to the default height. | |
| 184 | (defalias 'magit-diff-default-context #[0 "\300\301!\207" [magit-diff-set-context ignore] 2 (#$ . 40355) nil]) | |
| 185 | #@11 | |
| 186 | ||
| 187 | (fn FN) | |
| 188 | (defalias 'magit-diff-set-context #[257 "\302\303!\211\203 \304!\202 \305\262\306\307!@\310\307\311\203B \203B @\203, \310\262\2026 \312\313\"\2036 \211\262\210\211T\262A\262\202 \266\211\262\211\205O \314\315\"\211\203Y \304!\202Z \262\316\"!\211\205s \211U?\205s \317\320\"\211\203} \211B\202~ \321\322!\203\215 AA\240\210\202\217 \211\266\323 \207" [magit-refresh-args magit-diff-section-arguments magit-get "diff.context" string-to-number 3 magit-diff-arguments t nil 0 string-match "^-U\\([0-9]+\\)?$" match-string 1 delete format "-U%i" derived-mode-p magit-diff-mode magit-refresh] 11 (#$ . 40524)]) | |
| 189 | (defalias 'magit-diff-context-p #[0 "\300\301\302!@\302\303\2031 \2031 @\203 \300\262\202% \304\305\"\203% \211\262\210\211T\262A\262\202 \266\211\262\211\203A \211\306\232?\202B \302\207" [nil magit-diff-arguments t 0 string-match "^-U\\([0-9]+\\)$" "-U0"] 8]) | |
| 190 | (defalias 'magit-diff-ignore-any-space-p #[0 "\300\301!@\302\303\304\301\305\203/ \203/ @\203 \303\262\202# \211\235\262\210\211T\262A\262\202 \266\211\262!\207" [magit-diff-arguments t ---truthy\? nil ("--ignore-cr-at-eol" "--ignore-space-at-eol" "--ignore-space-change" "-b" "--ignore-all-space" "-w" "--ignore-blank-space") 0] 9]) | |
| 191 | #@595 Turn diff-hunk refining on or off. | |
| 192 | ||
| 193 | If hunk refining is currently on, then hunk refining is turned off. | |
| 194 | If hunk refining is off, then hunk refining is turned on, in | |
| 195 | `selected' mode (only the currently selected hunk is refined). | |
| 196 | ||
| 197 | With a prefix argument, the "third choice" is used instead: | |
| 198 | If hunk refining is currently on, then refining is kept on, but | |
| 199 | the refining mode (`selected' or `all') is switched. | |
| 200 | If hunk refining is off, then hunk refining is turned on, in | |
| 201 | `all' mode (all hunks refined). | |
| 202 | ||
| 203 | Customize variable `magit-diff-refine-hunk' to change the default mode. | |
| 204 | ||
| 205 | (fn &optional STYLE) | |
| 206 | (defalias 'magit-diff-toggle-refine-hunk #[256 "\301\300!\210\211\203 \302=\203 \303\202 \302\202 ?\304 \207" [magit-diff-refine-hunk make-local-variable all t magit-diff-update-hunk-refinement] 3 (#$ . 41808) "P"]) | |
| 207 | #@1279 From a diff, visit the corresponding file at the appropriate position. | |
| 208 | ||
| 209 | If the diff shows changes in the worktree, the index, or `HEAD', | |
| 210 | then visit the actual file. Otherwise, when the diff is about an | |
| 211 | older commit or a range, then visit the appropriate blob. | |
| 212 | ||
| 213 | If point is on a removed line, then visit the blob for the first | |
| 214 | parent of the commit which removed that line, i.e. the last | |
| 215 | commit where that line still existed. Otherwise visit the blob | |
| 216 | for the commit whose changes are being shown. | |
| 217 | ||
| 218 | Interactively, when the file or blob to be displayed is already | |
| 219 | being displayed in another window of the same frame, then just | |
| 220 | select that window and adjust point. Otherwise, or with a prefix | |
| 221 | argument, display the buffer in another window. The meaning of | |
| 222 | the prefix argument can be inverted or further modified using the | |
| 223 | option `magit-display-file-buffer-function'. | |
| 224 | ||
| 225 | Non-interactively the optional OTHER-WINDOW argument is taken | |
| 226 | literally. DISPLAY-FN can be used to specify the display | |
| 227 | function explicitly, in which case OTHER-WINDOW is ignored. | |
| 228 | ||
| 229 | The optional FORCE-WORKTREE means to force visiting the worktree | |
| 230 | version of the file. To do this interactively use the command | |
| 231 | `magit-diff-visit-file-worktree' instead. | |
| 232 | ||
| 233 | (fn FILE &optional OTHER-WINDOW FORCE-WORKTREE DISPLAY-FN) | |
| 234 | (defalias 'magit-diff-visit-file #[1025 "\301!\203 \302\"\207\303 \205% ?\205% \304\305!\205% \212\306 b\210\307\310!)\205, \311!\2054 \312\"\203= \313 \202? \314 \204Q \211;\203Q \315\n\"\202\\ \316 !\206\\ \317 !\320\321!\203i \322!\210\202\214 \203v !\210\202\214 \204\201 \323!\203\210 \324!\210\202\214 \325!\210\326\323\327\"\206\227 \330\331!!r\332\333\334\335\336!\337\"\340$\216\341@\342\"\210\203\372 \343=\203\300 \344\345\f\346$\202\332 \203\325 ;\203\325 \344\345\f$\202\332 \344\347\"\262\214~\210eb\210Sy\210\350!\210`)\351ed#\204\371 ~\210\211b\210\210\352 !\203\353 \210\354\355!*\262\207" [magit-diff-visit-previous-blob magit-file-accessible-directory-p magit-diff-visit-directory magit-diff-visit--hunk magit-section-match hunk line-beginning-position looking-at "-" magit-diff-hunk-line magit-diff-hunk-column magit-diff-visit--range-beginning magit-diff-visit--range-end magit-find-file-noselect get-file-buffer find-file-noselect called-interactively-p any magit-display-file-buffer get-buffer-window switch-to-buffer-other-window pop-to-buffer internal--before-with-selected-window visible error "File buffer is not visible" make-byte-code 0 "\301\300!\207" vconcat vector [internal--after-with-selected-window] 2 select-window norecord staged apply magit-diff-visit--offset nil + move-to-column <= magit-anything-unmerged-p smerge-start-session run-hooks magit-diff-visit-file-hook] 17 (#$ . 42633) (byte-code "\301 \211\203\f \302!\202 \303\304!\262D\207" [current-prefix-arg magit-file-at-point expand-file-name user-error "No file at point"] 3)]) | |
| 235 | #@546 From a diff, visit the corresponding file at the appropriate position. | |
| 236 | The file is shown in another window. | |
| 237 | ||
| 238 | If the diff shows changes in the worktree, the index, or `HEAD', | |
| 239 | then visit the actual file. Otherwise, when the diff is about an | |
| 240 | older commit or a range, then visit the appropriate blob. | |
| 241 | ||
| 242 | If point is on a removed line, then visit the blob for the first | |
| 243 | parent of the commit which removed that line, i.e. the last | |
| 244 | commit where that line still existed. Otherwise visit the blob | |
| 245 | for the commit whose changes are being shown. | |
| 246 | ||
| 247 | (fn FILE) | |
| 248 | (defalias 'magit-diff-visit-file-other-window #[257 "\300\301\"\207" [magit-diff-visit-file t] 4 (#$ . 45551) (byte-code "\300 \211\203\f \301!\202 \302\303!\262C\207" [magit-file-at-point expand-file-name user-error "No file at point"] 3)]) | |
| 249 | #@333 The function used by `magit-diff-visit-file' to display blob buffers. | |
| 250 | ||
| 251 | Other commands such as `magit-find-file' do not use this | |
| 252 | function. Instead they use high-level functions to select the | |
| 253 | window to be used to display the buffer. This variable and the | |
| 254 | related functions are an experimental feature and should be | |
| 255 | treated as such. | |
| 256 | (defvar magit-display-file-buffer-function 'magit-display-file-buffer-traditional (#$ . 46349)) | |
| 257 | #@15 | |
| 258 | ||
| 259 | (fn BUFFER) | |
| 260 | (defalias 'magit-display-file-buffer #[257 "!\207" [magit-display-file-buffer-function] 3 (#$ . 46783)]) | |
| 261 | #@210 Display BUFFER in the current window. | |
| 262 | With a prefix argument display it in another window. | |
| 263 | Option `magit-display-file-buffer-function' controls | |
| 264 | whether `magit-diff-visit-file' uses this function. | |
| 265 | ||
| 266 | (fn BUFFER) | |
| 267 | (defalias 'magit-display-file-buffer-traditional #[257 "\204\n \301!\203 \302!\207\303!\207" [current-prefix-arg get-buffer-window pop-to-buffer switch-to-buffer] 3 (#$ . 46911)]) | |
| 268 | #@210 Display BUFFER in another window. | |
| 269 | With a prefix argument display it in the current window. | |
| 270 | Option `magit-display-file-buffer-function' controls | |
| 271 | whether `magit-diff-visit-file' uses this function. | |
| 272 | ||
| 273 | (fn BUFFER) | |
| 274 | (defalias 'magit-display-file-buffer-other-window #[257 "\203 \301!\207\302!\207" [current-prefix-arg switch-to-buffer pop-to-buffer] 3 (#$ . 47312)]) | |
| 275 | #@622 From a diff, visit the corresponding file at the appropriate position. | |
| 276 | ||
| 277 | When the file is already being displayed in another window of the | |
| 278 | same frame, then just select that window and adjust point. With | |
| 279 | a prefix argument also display in another window. | |
| 280 | ||
| 281 | The actual file in the worktree is visited. The positions in the | |
| 282 | hunk headers get less useful the "older" the changes are, and | |
| 283 | as a result, jumping to the appropriate position gets less | |
| 284 | reliable. | |
| 285 | ||
| 286 | Also see `magit-diff-visit-file' which visits the respective | |
| 287 | blob, unless the diff shows changes in the worktree, the index, | |
| 288 | or `HEAD'. | |
| 289 | ||
| 290 | (fn FILE &optional OTHER-WINDOW) | |
| 291 | (defalias 'magit-diff-visit-file-worktree #[513 "\300\301#\207" [magit-diff-visit-file t] 6 (#$ . 47683) (byte-code "\301 \206 \302\303!D\207" [current-prefix-arg magit-file-at-point user-error "No file at point"] 2)]) | |
| 292 | (defalias 'magit-diff-visit--range-end #[0 "\300 \2119\203 \211\202& \211:\203 \211A\202 \301!A\262\302!\203% \303\202& \211\207" [magit-diff--dwim magit-split-range magit-rev-head-p unstaged] 3]) | |
| 293 | (defalias 'magit-diff-visit--range-beginning #[0 "\300 \211:\203 \211A\301P\202 \211;\203 \302!@\202 \211\207" [magit-diff--dwim "^" magit-split-range] 3]) | |
| 294 | (defalias 'magit-diff-visit--hunk #[0 "\300 \211\205@ \301 \302\303\"\203 \304\305\"@\262\2022 \306\307\"\2032 \304\305\"@\262\211\2032 \304\305\"@\262\211\205> \304\310\"\205> \211\262\207" [magit-diff-scope magit-current-section memql (file files) eieio-oref children eql list value] 5]) | |
| 295 | #@40 | |
| 296 | ||
| 297 | (fn FILE REV HUNK-START LINE-OFFSET) | |
| 298 | (defalias 'magit-diff-visit--offset #[1028 "\301\302\303!r\211q\210\304\301\305\306\307!\310\"\311$\216\212\312 \211\203* \211\313\314\315\n$\210)\202- \316 \210\210)\3172\264 \320\321\322\323#\205\263 \324\325\326!!\324\325\311!!\324\325\327!!\324\325\330!!\\\\ \\ X\203\251 Y\204n Y\203\235 \301\211X\203\231 \326y\210\211T\262\331\332!\203\213 T\262\n\202o \331\333!\203o S\262\n\202o \210\202\256 Z\\\262 \202\256 \334\317\322\"\210\266\2023 0\210*\210\335#\207" [default-directory 0 generate-new-buffer " *temp*" make-byte-code "\301\300!\205 \302\300!\207" vconcat vector [buffer-name kill-buffer] 2 magit-toplevel magit-git-insert "diff" "--" magit--not-inside-repository-error found re-search-forward "^@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@" nil t string-to-number match-string 1 3 4 looking-at "^\\+" "^-" throw +] 16 (#$ . 49198)]) | |
| 299 | #@16 | |
| 300 | ||
| 301 | (fn SECTION) | |
| 302 | (defalias 'magit-diff-hunk-line #[257 "\301\302\"\211G\303Z\304\301\305\"!\306 \212b\210\306 )G\307U\205' \212\310 b\210\311\312!)\313\2033 A@\2028 \314!@\315\316\317\203C \312\202D \320\"\"\210\321\322\323\"!\262V\203c \212b\210\324\325!\210\306 \262)\212b\210\306 W\203\225 \203v \320\202w \312`` \\{\326\327\315#)\266\203\204\217 T\262\326y\210\202g )\211D\207" [inhibit-changing-match-data eieio-oref value 2 marker-position content line-number-at-pos 3 line-beginning-position looking-at "-" 0 last string-match format "^%s\\([0-9]+\\)" "\\+" string-to-number match-string 1 re-search-forward "^[-+]" nil t] 16 (#$ . 50145)]) | |
| 303 | #@32 | |
| 304 | ||
| 305 | (fn SECTION VISIT-BEGINNING) | |
| 306 | (defalias 'magit-diff-hunk-column #[514 "`\301\302\"W\204 \211\204 \212\303 \210\304\305\306!)\262)\203 \307\207\307i\310\\\301\311\"GZ]\207" [inhibit-changing-match-data eieio-oref content beginning-of-line "-" t looking-at 0 2 value] 7 (#$ . 50825)]) | |
| 307 | #@41 | |
| 308 | ||
| 309 | (fn DIRECTORY &optional OTHER-WINDOW) | |
| 310 | (defalias 'magit-diff-visit-directory #[513 "\301!\301 \232\203 \302\303P\"\207\211\203 \304\202 \305\306!)\207" [display-buffer-overriding-action magit-toplevel dired-jump "/." (nil (inhibit-same-window t)) (display-buffer-same-window) magit-status-internal] 6 (#$ . 51123)]) | |
| 311 | #@349 Update the commit or diff buffer for the thing at point. | |
| 312 | ||
| 313 | Either show the commit or stash at point in the appropriate | |
| 314 | buffer, or if that buffer is already being displayed in the | |
| 315 | current frame and contains information about that commit or | |
| 316 | stash, then instead scroll the buffer up. If there is no | |
| 317 | commit or stash at point, then prompt for a commit. | |
| 318 | (defalias 'magit-diff-show-or-scroll-up #[0 "\300\301!\207" [magit-diff-show-or-scroll scroll-up] 2 (#$ . 51455) nil]) | |
| 319 | #@351 Update the commit or diff buffer for the thing at point. | |
| 320 | ||
| 321 | Either show the commit or stash at point in the appropriate | |
| 322 | buffer, or if that buffer is already being displayed in the | |
| 323 | current frame and contains information about that commit or | |
| 324 | stash, then instead scroll the buffer down. If there is no | |
| 325 | commit or stash at point, then prompt for a commit. | |
| 326 | (defalias 'magit-diff-show-or-scroll-down #[0 "\300\301!\207" [magit-diff-show-or-scroll scroll-down] 2 (#$ . 51929) nil]) | |
| 327 | #@11 | |
| 328 | ||
| 329 | (fn FN) | |
| 330 | (defalias 'magit-diff-show-or-scroll #[257 "\305\211\211\211\203 \306\307 \310\"\262\311\262\312\313!\262\202\243 \314\315!\203M \212\316 b\210 \2052 \317 !\2052 \320\321!\211\203D \211\262\311\262\312\313!\262\202H \322\323!\210\210)\202\243 \324 \211\203m \325\326\"\203m \327\306\330\"!\262\311\262\312\313!\262\202\242 \211\203\211 \325\331\"\203\211 \306\330\"\262\311\262\312\313!\262\202\242 \211\203\242 \325\332\"\203\242 \306\330\"\262\333\262\312\334!\262\210\203\203\377 \335!\211\262\203\377 rq\210\n@\232\205\304 \336! \232)\203\377 \337!r\340\341\342\343\344!\345\"\321$\216\346@\347\"\210\3501\350 0\202\371 \210\351\267\202\367 e\202\370 d\202\370 \305b*\262\202\352 \311=\203\353\311\354 #\202!)\202\355\311!\207" [magit-blame-mode git-rebase-line magit-refresh-args magit-buffer-revision-hash magit-display-buffer-noselect nil eieio-oref magit-current-blame-chunk orig-rev magit-show-commit magit-mode-get-buffer magit-revision-mode derived-mode-p git-rebase-mode line-beginning-position looking-at match-string 2 user-error "No commit on this line" magit-current-section magit-section-match-1 branch magit-ref-maybe-qualify value commit stash magit-stash-show magit-stash-mode get-buffer-window magit-rev-parse internal--before-with-selected-window make-byte-code 0 "\301\300!\207" vconcat vector [internal--after-with-selected-window] select-window norecord (error) #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (scroll-up 239 scroll-down 243)) t apply magit-show-commit--arguments call-interactively] 12 (#$ . 52408)]) | |
| 331 | #@31 Keymap for `magit-diff-mode'. | |
| 332 | (defvar magit-diff-mode-map (byte-code "\301 \302\"\210\303\304\305#\210\303\306\307#\210\303\310\311#\210\303\312\313#\210\303\314\315#\210\303\316\317#\210\303\320\321#\210\211\207" [magit-mode-map make-sparse-keymap set-keymap-parent define-key "" magit-diff-while-committing "" magit-go-backward "" magit-go-forward " " scroll-up "" scroll-down "j" magit-jump-to-diffstat-or-diff [remap write-file] magit-patch-save] 5) (#$ . 54055)) | |
| 333 | (defvar magit-diff-mode-hook nil) | |
| 334 | (byte-code "\300\301N\204\f \302\300\301\303#\210\304\305!\204 \302\305\306\307#\210\300\207" [magit-diff-mode-hook variable-documentation put "Hook run after entering Magit Diff mode.\nNo problems result if this variable is not bound.\n`add-hook' automatically binds it. (This is true for all hook variables.)" boundp magit-diff-mode-map definition-name magit-diff-mode] 4) | |
| 335 | (defvar magit-diff-mode-map (make-sparse-keymap)) | |
| 336 | (byte-code "\301\302N\204 \303\301\302\304\305!#\210\306\307!\204 \303\307\310\311#\210\312\313 !\210\307\302N\204- \303\307\302\304\314!#\210\306\300!\204B \303\300\310\311#\210\315\316\300\317\"\210!\210\300\302N\204P \303\300\302\304\320!#\210\303\311\321\322#\210\303\311\323\324#\207" [magit-diff-mode-abbrev-table magit-diff-mode-map variable-documentation put purecopy "Keymap for `magit-diff-mode'." boundp magit-diff-mode-syntax-table definition-name magit-diff-mode (lambda (#1=#:def-tmp-var) (defvar magit-diff-mode-syntax-table #1#)) make-syntax-table "Syntax table for `magit-diff-mode'." (lambda (#1#) (defvar magit-diff-mode-abbrev-table #1#)) define-abbrev-table nil "Abbrev table for `magit-diff-mode'." derived-mode-parent magit-mode custom-mode-group magit-diff] 5) | |
| 337 | #@809 Mode for looking at a Git diff. | |
| 338 | ||
| 339 | This mode is documented in info node `(magit)Diff Buffer'. | |
| 340 | ||
| 341 | \<magit-mode-map>Type \[magit-refresh] to refresh the current buffer. | |
| 342 | Type \[magit-section-toggle] to expand or hide the section at point. | |
| 343 | Type \[magit-visit-thing] to visit the hunk or file at point. | |
| 344 | ||
| 345 | Staging and applying changes is documented in info node | |
| 346 | `(magit)Staging and Unstaging' and info node `(magit)Applying'. | |
| 347 | ||
| 348 | \<magit-hunk-section-map>Type \[magit-apply] to apply the change at point, \[magit-stage] to stage, | |
| 349 | \[magit-unstage] to unstage, \[magit-discard] to discard, or \[magit-reverse] to reverse it. | |
| 350 | ||
| 351 | \{magit-diff-mode-map} | |
| 352 | ||
| 353 | In addition to any hooks its parent mode `magit-mode' might have run, | |
| 354 | this mode runs the hook `magit-diff-mode-hook', as the final or penultimate step | |
| 355 | during initialization. | |
| 356 | (defalias 'magit-diff-mode #[0 "\306\300!\210\307\310 \210\311\312\310\313N\203 \314\311\313\310\313N#\210\315 !\204' \316 \317 \"\210\320\f!\211\2035 \211\321 =\203; \322\f\323 \"\210\210\324 \325\"\204R =\204R \326 \325 C#\210\327 !\210\330\f!\210 \331 \210\332!\333\"\306\334!\210\335 )\336\337!\207" [delay-mode-hooks major-mode mode-name magit-diff-mode-map magit-diff-mode-syntax-table magit-diff-mode-abbrev-table make-local-variable t magit-mode magit-diff-mode "Magit Diff" mode-class put keymap-parent set-keymap-parent current-local-map char-table-parent standard-syntax-table set-char-table-parent syntax-table abbrev-table-get :parents abbrev-table-put use-local-map set-syntax-table hack-dir-local-variables-non-file-buffer magit-imenu--diff-prev-index-position-function magit-imenu--diff-extract-index-name-function bookmark-make-record-function magit-bookmark--diff-make-record run-mode-hooks magit-diff-mode-hook local-abbrev-table imenu-prev-index-position-function imenu-extract-index-name-function] 5 (#$ . 55795) nil]) | |
| 357 | #@241 Refresh the current `magit-diff-mode' buffer. | |
| 358 | ||
| 359 | In such buffers the buffer-local value of `magit-refresh-args' | |
| 360 | has the same form as the arguments of this function. The value | |
| 361 | is set in `magit-mode-setup'. | |
| 362 | ||
| 363 | (fn REV-OR-RANGE CONST ARGS FILES) | |
| 364 | (defalias 'magit-diff-refresh-buffer #[1028 "\306\307\235\203 \310\311\312#\202\\ \2033 \313\314\315\316#)\266\203\203+ \311\317\"\202> \311\320\"\202> \321\235\203= \322\202> \323G\211\324\267\202Q \314\202Y \325@P\202Y \326\327\330\331#P\262P!\210\332\333!\203i \211\202q \211 \236A\206q \334\335\333!\203\210 \336 \"@\206\211 \337\340\301#\202\211 \341\314\342\343 \344\n&\345\346\347\350\"\211\203\243 \211\351=\202\325 \205\256 \352\353! \"\211\203\271 \354\346\"\202\323 \355\f\"\211\205\321 \356!\203\316 \211!\262\211\351=\262\262\262#\210\211 \206\347 \n?\205\347 @\3572\253\360\361\"\210\362\363!\210\364!\210\365\354\366\"\315\"\210\345\367\343 #\370\371\"\372\311\373\354\374\"\"!\372\311\375\354\374\"\"!\203,J\206?\376!\2037J\206?\376!\205?\211J\212\354\366\"b\210`W\203|\377`\334\"\206U\201B `\334\"\204u\201C `\334\n$\210\203u\201C `\371$\210\211b\266\202G)\266\211 =\203\221\314 A\201D !)\202\252\345\354\201E \"\201F \354\211\201E \"\201F \"C\244#0\210+\207" [inhibit-changing-match-data magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-set-header-line-format "--no-index" apply format "Differences between %s and %s" "\\(\\.\\.\\|\\^-\\)" nil t string-match "Changes in %s" "Changes from %s to working tree" "--cached" "Staged changes" "Unstaged changes" #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (0 70 1 74)) " in file " " in files " mapconcat identity ", " diffbuf class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-run-section-hook magit-diff-sections-hook run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start end eieio-oref-default keymap intern "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change magit-insert-section--current magit-section-cache-visibility get-text-property put-text-property magit-section-show parent children] 17 (#$ . 57663)]) | |
| 365 | #@72 Insert the diff into this `magit-diff-mode' buffer. | |
| 366 | ||
| 367 | (fn REV-OR-RANGE) | |
| 368 | (defalias 'magit-insert-diff #[257 "\302\303\"\304\305\306\307\310\311\312 8\235\205 \313 A@\312 8\314\315 8&\n)\207" [magit-git-global-arguments magit-refresh-args remove "--literal-pathspecs" magit-git-wash magit-diff-wash-diffs "diff" "-p" "--no-prefix" "--stat" 2 "--numstat" "--" 3] 13 (#$ . 60237)]) | |
| 369 | #@29 Keymap for `file' sections. | |
| 370 | (defvar magit-file-section-map (byte-code "\300 \301\302!\204 \303\304\305#\210\303\306\305#\210\303\307\310#\210\303\311\312#\210\303\313\314#\210\303\315\316#\210\303\317\320#\210\303\321\322#\210\303\323\324#\210\303\325\326#\210\303\327\330#\210\303\331\332#\210\211\207" [make-sparse-keymap featurep jkl define-key "\n" magit-diff-visit-file-worktree [C-return] [remap magit-visit-thing] magit-diff-visit-file [remap magit-delete-thing] magit-discard [remap magit-revert-no-commit] magit-reverse "a" magit-apply "C" magit-commit-add-log "s" magit-stage "u" magit-unstage "&" magit-do-async-shell-command "" magit-diff-trace-definition "" magit-diff-edit-hunk-commit] 5) (#$ . 60624)) | |
| 371 | #@29 Keymap for `hunk' sections. | |
| 372 | (defvar magit-hunk-section-map (byte-code "\300 \301\302!\204 \303\304\305#\210\303\306\305#\210\303\307\310#\210\303\311\312#\210\303\313\314#\210\303\315\316#\210\303\317\320#\210\303\321\322#\210\303\323\324#\210\303\325\326#\210\303\327\330#\210\303\331\332#\210\211\207" [make-sparse-keymap featurep jkl define-key "\n" magit-diff-visit-file-worktree [C-return] [remap magit-visit-thing] magit-diff-visit-file [remap magit-delete-thing] magit-discard [remap magit-revert-no-commit] magit-reverse "a" magit-apply "C" magit-commit-add-log "s" magit-stage "u" magit-unstage "&" magit-do-async-shell-command "" magit-diff-trace-definition "" magit-diff-edit-hunk-commit] 5) (#$ . 61364)) | |
| 373 | (defconst magit-diff-headline-re "^\\(@@@?\\|diff\\|Submodule\\|\\* Unmerged path\\|merged\\|changed in both\\|added in remote\\|removed in remote\\)") | |
| 374 | (defconst magit-diff-statline-re "^ ?\\(.*\\)\\( +| +\\)\\([0-9]+\\|Bin\\(?: +[0-9]+ -> [0-9]+ bytes\\)?$\\) ?\\(\\+*\\)\\(-*\\)$") | |
| 375 | #@29 | |
| 376 | ||
| 377 | (fn ARGS &optional LIMIT) | |
| 378 | (defalias 'magit-diff-wash-diffs #[513 "\301\235\203 \302 \210\303\304#\205 \305 b\210\306\307\310\"!\210\311c\207" [magit-diff-headline-re "--stat" magit-diff-wash-diffstat re-search-forward t line-beginning-position magit-wash-sequence apply-partially magit-diff-wash-diff 10] 6 (#$ . 62388)]) | |
| 379 | #@185 Jump to the diffstat or diff. | |
| 380 | When point is on a file inside the diffstat section, then jump | |
| 381 | to the respective diff section, otherwise jump to the diffstat | |
| 382 | section or a child thereof. | |
| 383 | (defalias 'magit-jump-to-diffstat-or-diff #[0 "\301\302\303 \211\203 \304\305\"\203 \306\307\310\"BC\2020 \211\203/ \304\306\"\203/ \306\307\310\"B\311B\2020 \312\262\313!\"!\211\203A \314!\202D \315\316!\207" [magit-root-section magit-get-section append magit-current-section magit-section-match-1 [file diffstat] file eieio-oref value ((diffstat)) ((diffstat)) magit-section-ident magit-section-goto user-error "No diffstat in this buffer"] 7 (#$ . 62725) nil]) | |
| 384 | (defalias 'magit-diff-wash-diffstat #[0 "\306`\307\310\306\311#\205\266\312\313!\262\314 \210\211b\210\315\316!\203 \211\202( \211\236A\206( \317\320\316!\203? \321\"@\206@ \322\323\300#\202@ \324\306\325\326 \327 &\330\331\332\333\"\211\203Z \211\334=\202\214 \n\205e \335\336!\n\"\211\203p \337\331\"\202\212 \340 \"\211\205\210 \341!\203\205 \211!\262\211\334=\262\262\262#\210\211\n\206\236 ?\205\236 \f \3422\262\343\344\345#c\210\346 \210\306\347\350!\203\327 \351\312\313!\352\353\"\203\311 \211\354\225\306O\202\312 \211\262!B\262\355 \210\202\260 \211\237\262\347@!\203\314\306\312\313\"\312\356\"\312\357\"\312\360\"\312\361\"\355 \210\352\362\"\203\312\354\"P\262\354\211\224O\262G\306\351!\262G\262V\2032\363Z\364\"P\262\266\365\316!\203?\211\202G\211\236A\206G\317\320\316!\203^\321\"@\206_\322\323\300#\202_\324 \211A\262 \242\325\326 \327 &\330\331\332\333\"\211\203\211\334=\202\261\n\205\212\335\336!\n\"\211\203\225\337\331\"\202\257\340 \"\211\205\255\341!\203\252\211!\262\211\334=\262\262\262#\210\211\n\206\303 ?\205\303\f \3422\305\343\344\366#\367\261\210\203\343\343\344\370#c\210\203\356\343\344\371#c\210\372c\210\373\374!\210\375!\210\376\337\377\"\311\"\210\330\201B \326 #\201C \201D \"\201E \201F \201G \337\201H \"\"!\201E \201F \201I \337\201H \"\"!\203>J\206U\201J !\203KJ\206U\201J !\205U\211J\212\337\377\"b\210`W\203\226\201K `\317\"\206m\201L `\317\"\204\217\201M `\317\n$\210\203\217\201M `\201D $\210\211b\266\202])\266\211\f=\203\253\306 A\201N !)\202\304\330\337\201O \"\201P \337\211\201O \"\201P \"C\244#0\210+\266\202\333 \210\347\201Q !\203\333\306y\210\202\336\372c\210\373\374!\210\375!\210\376\337\377\"\311\"\210\330\201B \326 #\201C \201D \"\201E \201F \201G \337\201H \"\"!\201E \201F \201I \337\201H \"\"!\203+J\206B\201J !\2038J\206B\201J !\205B\211J\212\337\377\"b\210`W\203\203\201K `\317\"\206Z\201L `\317\"\204|\201M `\317\n$\210\203|\201M `\201D $\210\211b\266\202J)\266\211\f=\203\230\306 A\201N !)\202\261\330\337\201O \"\201P \337\211\201O \"\201P \"C\244#0\210+\262\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current nil re-search-forward "^ ?\\([0-9]+ +files? change[^\n]*\n\\)" t match-string 1 magit-delete-match diffstat class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section propertize face magit-diff-file-heading magit-insert-heading looking-at "^[-0-9]+ [-0-9]+ \\(.+\\)$" magit-decode-git-path string-match " => " 0 magit-delete-line 2 3 4 5 " +$" make-string 32 file magit-filename " " magit-diffstat-added magit-diffstat-removed "\n" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start magit-diff-statline-re magit-section-cache-visibility end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children "^$"] 24]) | |
| 385 | #@13 | |
| 386 | ||
| 387 | (fn ARGS) | |
| 388 | (defalias 'magit-diff-wash-diff #[257 "\306\307!\203 \310 \207\306\311!\203P\312\313\314!!\315 \210\316\317!\203# \320\235\203M\321\322!\203. \211\2026 \211\236A\2066 \323\324\322!\203M \325\"@\206N \326\327\300#\202N \330\331\332 \333 &\334\335\336\337\"\211\203h \211\340=\202\232 \n\205s \341\342!\n\"\211\203~ \343\335\"\202\230 \344 \"\211\205\226 \345!\203\223 \211!\262\211\340=\262\262\262#\210\211\n\206\254 ?\205\254 \f \3462I\347\350\351\352!@AA\211:\205n\211@\211\353\267\202kA\211:\205\367 \211@\211\354\267\202\364 A\211?\205\342 \355\262\202\365 A\211?\205\357 \356\262\202\365 \357\262\262\202lA\211:\2055\211@\211\360\267\2022A\211?\205\361\262\2023A\211?\205 \362\262\2023A\211?\205-\363\262\2023\357\262\262\202lA\211:\205f\211@\211\364\267\202cA\211?\205Q\365\262\202dA\211?\205^\366\262\202d\357\262\262\202l\357\262\262#\367\370#c\210\371c\210\372\373!\210\374!\210\375\343\376\"\377\"\210\334\201D \332 #\201E \201F \"\201G \350\201H \343\201I \"\"!\201G \350\201J \343\201I \"\"!\203\302J\206\331\201K !\203\317J\206\331\201K !\205\331\211J\212\343\376\"b\210`W\203\201L `\323\"\206\361\201M `\323\"\204\201N `\323\n$\210\203\201N `\201F $\210\211b\266\202\341)\266\211\f=\203/\357 @\201O !)\202H\334\343\201P \"\201Q \343\211\201P \"\201Q \"C\244#0\210+\266\210\377\207\306\201R !\203\344\313\314!\211\201S \267\202{\201T \202|\201U \202|\201V \202|\201W \202|\357\262\357\211\211\211\315 \210\306\201X !\203\303\357\313\314\"\313\201Y \"\313\201Z \"\201[ \267\202\273\211\262\202\273\211\262\202\273\211\262\202\273\211\262\266\315 \210\202\205\203\314\312!\262\203\325\312!\262\201\\ \206\335\357%\207\306\201] !\205K\313\314!\201^ \232\203\374\201_ \202 \316\201` !\203\n\201a \202 \201b \313\201Y !\206\313\201c !`\357\211\211\212\314y\210\201d A\357\377#\2035\201e \224\2026d{\262)\315 \210m\204\313\306A!\204\313\306\201f !\203_\313\201e !\262\201g \210\202=\306\201h !\203o\313\314!\262\202\305\306\201i !\203\313\314!\262\202\305\306\201j !\203\221\313\201Y !\262\202\305\306\201k !\203\270\313\201Y !\262\313\314!\201l \232\203\260\201V \202\263\201m \262\202\305\306\201n !\203\305\313\314!\262\315 \210\202=\203\324\312!\262\312!\262\316\201o !\203>\357BA@\377\201e \203\"\203\"@\203\376\357\262\202\201p \357\377 C\201q #)\266\203\203\211\262\210\211T\262A\262\202\352\266\211\262\203>\201Y \357O\262\203>\201Y \357O\262\201\\ %\266\206\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current looking-at "^Submodule" magit-diff-wash-submodule "^\\* Unmerged path \\(.*\\)" magit-decode-git-path match-string 1 magit-delete-line derived-mode-p magit-status-mode "--cached" file class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section propertize format "unmerged %s%s" magit-file-status #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (68 203 85 252 65 314)) #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (68 218 85 231)) " (both deleted)" " (deleted by us)" nil #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (68 267 65 280 85 293)) " (deleted by them)" " (added by them)" "" #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (65 329 85 342)) " (both added)" " (added by us)" face magit-diff-file-heading 10 run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t magit-section-cache-visibility magit-diff-headline-re magit-refresh-args inhibit-changing-match-data end eieio-oref-default keymap intern "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children "^\\(merged\\|changed in both\\|added in remote\\|removed in remote\\)" #s(hash-table size 4 test equal rehash-size 1.5 rehash-threshold 0.8125 purecopy t data ("merged" 611 "changed in both" 617 "added in remote" 623 "removed in remote" 629)) "merged" "conflict" "new file" "deleted" "^ \\([^ ]+\\) +[0-9]\\{6\\} \\([a-z0-9]\\{40\\}\\) \\(.+\\)$" 2 3 #s(hash-table size 4 test equal rehash-size 1.5 rehash-threshold 0.8125 purecopy t data ("result" 678 "our" 684 "their" 690 "base" 696)) magit-diff-insert-file-section "^diff --\\(?:\\(git\\) \\(?:\\(.+?\\) \\2\\)?\\|\\(cc\\|combined\\) \\(.+\\)\\)" "git" "modified" magit-revision-mode "resolved" "unmerged" 4 re-search-forward 0 "^old mode \\([^\n]+\\)\nnew mode \\([^\n]+\\)\n" magit-delete-match "^--- \\([^/].*?\\) ?$" "^\\+\\+\\+ \\([^/].*?\\) ?$" "^\\(copy\\|rename\\) from \\(.+\\)$" "^\\(copy\\|rename\\) to \\(.+\\)$" "copy" "renamed" "^\\(new file\\|deleted\\)" magit-log-mode "\\`-L" string-match] 19 (#$ . 66836)]) | |
| 389 | #@38 | |
| 390 | ||
| 391 | (fn FILE ORIG STATUS MODES HEADER) | |
| 392 | (defalias 'magit-diff-insert-file-section #[1285 "\306\307!\203 \211\202 \211\236A\206 \310\311\307!\203* \312\"@\206+ \313\314\300#\202+ \315 \316\317 \320 &\321\322\323\324\"\211\203F \211\325=\202\205 \n\205Q \326\327!\n\"\211\203\\ \330\322\"\202\203 \331 \"\211\203w \332!\203q \211!\262\211\325=\202\201 \n\333\232\206\201 \334\335!\262\262\262#\210\211\n\206\227 ?\205\227 \f \3362\311\211\337\340\341\n\203\261 \n\f\232\203\266 \202\275 \340\342\f##\343\344#c\210\345 \210\232\204\325 \321\346 #\210\321\347#\210\203 \350\307!\203\353 \211\202\363 \211\236A\206\363 \310\311\307!\203\n\312\"@\206 \313\314\300#\202 \315\351\316\317 \320 &\321\322\323\324\"\211\203%\211\325=\202W\n\2050\326\327!\n\"\211\203;\330\322\"\202U\331 \"\211\205S\332!\203P\211!\262\211\325=\262\262\262#\210\211\n\206i ?\205i\f \3362c\210\352\353!\210\354!\210\355\330\356\"\357\"\210\321\360\317 #\361\362\"\363\340\364\330\365\"\"!\363\340\366\330\365\"\"!\203\253J\206\276\367!\203\266J\206\276\367!\205\276\211J\212\330\356\"b\210`W\203\365\370`\310\"\206\324\371`\310\"\204\356\372`\310\n$\210\203\356\372`\362$\210\211b\266\202\306)\266\211\f=\203\351 @\373!)\202\321\330\374\"\375\330\211\374\"\375\"C\244#0\210+\266\376\377!\266\352\353!\210\354!\210\355\330\356\"\357\"\210\321\360\317 #\361\362\"\363\340\364\330\365\"\"!\363\340\366\330\365\"\"!\203ZJ\206m\367!\203eJ\206m\367!\205m\211J\212\330\356\"b\210`W\203\244\370`\310\"\206\203\371`\310\"\204\235\372`\310\n$\210\203\235\372`\362$\210\211b\266\202u)\266\211\f=\203\267\351 @\373!)\202\310\321\330\374\"\375\330\211\374\"\375\"C\244#0\210+\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current file class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp "deleted" derived-mode-p magit-status-mode cancel-section propertize format "%-10s %s\n" "%s -> %s" face magit-diff-file-heading magit-insert-heading source header hunk nil run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit-wash-sequence magit-diff-wash-hunk magit-section-cache-visibility] 21 (#$ . 72127)]) | |
| 393 | (defalias 'magit-diff-wash-submodule #[0 "\306\307!\205\243\310\311!\312\211\306\313!\203 \314 \210\315\262\306\316!\203# \314 \210\315\262\306\317!\203Z\310\311!\232\203Z\312\310\311\"\310\320\"\310\321\"\314 \210\306\322!\203M \314 \210\202A \211\203\\ \323\324\325\315\211\311&\262\326\327!\203g \211\202o \211\236A\206o \330\331\327!\203\206 \332\"@\206\207 \333\334\300#\202\207 \335 \336\337 \340 &\341\342\343\344\"\211\203\242 \211\345=\202\330 \n\205\255 \346\347!\n\"\211\203\270 \350\342\"\202\326 \351 \"\211\203\323 \352!\203\315 \211!\262\211\345=\202\324 \315\262\262\262#\210\211\n\206\352 ?\205\352 \f \3532O\354\355\356 P\357\360#\361\203\362\202\363\312\315 @\364#)\266\203\203\365\202\366\n\204$ \205?\367 \205+\370\f\2056 \2056\371\205<\372\373\260\374%\210\375\376\n\377 \"! A\201C \201D \201E \201F \"\201G \201H \201I %\210\201J \201K !\210)\201L \201M !\210\201N !\210\201O \350\201P \"\315\"\210\341\201Q \337 #\201R \201S \"\201T \201U \201V \350\201W \"\"!\201T \201U \201X \350\201W \"\"!\203\306J\206\335\201Y !\203\323J\206\335\201Y !\205\335\211J\212\350\201P \"b\210`W\203 \201Z `\330\"\206\367\201[ `\330\"\204\201\\ `\330\n$\210\203\201\\ `\201S $\210\211b\266\202\347)\266\211\f=\2035\312 B\201] !)\202N\341\350\201^ \"\201_ \350\211\201^ \"\201_ \"C\244#0\210+\262\266\203\262\202\241\306\201` !\203\310\311!\232\203\312\310\311\"\310\320\"\310\321\"\314 \210\326\327!\203\205\211\202\215\211\236A\206\215\330\331\327!\203\244\332\"@\206\245\333\334\300#\202\245\335 \336\337 \340 &\341\342\343\344\"\211\203\300\211\345=\202\362\n\205\313\346\347!\n\"\211\203\326\350\342\"\202\360\351 \"\211\205\356\352!\203\353\211!\262\211\345=\262\262\262#\210\211\n\206 ?\205\f \3532\373\354\355\201a P\357\360#\361\374$\210\201L \201M !\210\201N !\210\201O \350\201P \"\315\"\210\341\201Q \337 #\201R \201S \"\201T \201U \201V \350\201W \"\"!\201T \201U \201X \350\201W \"\"!\203rJ\206\211\201Y !\203J\206\211\201Y !\205\211\211J\212\350\201P \"b\210`W\203\314\201Z `\330\"\206\243\201[ `\330\"\204\305\201\\ `\330\n$\210\203\305\201\\ `\201S $\210\211b\266\202\223)\266\211\f=\203\341\312 B\201] !)\202\372\341\350\201^ \"\201_ \350\211\201^ \"\201_ \"C\244#0\210+\262\266\203\262\202\241\326\327!\203\211\202\211\236A\206\330\331\327!\2030\332\"@\2061\333\334\300#\2021\335\336\337 \340 &\341\342\343\344\"\211\203L\211\345=\202~\n\205W\346\347!\n\"\211\203b\350\342\"\202|\351 \"\211\205z\352!\203w\211!\262\211\345=\262\262\262#\210\211\n\206\220 ?\205\220\f \3532\235\354\355\356P\357\360#\361\205\246\370\205\261\205\261\371\205\267\372\201b &\210\201L \201M !\210\201N !\210\201O \350\201P \"\315\"\210\341\201Q \337 #\201R \201S \"\201T \201U \201V \350\201W \"\"!\201T \201U \201X \350\201W \"\"!\203J\206+\201Y !\203!J\206+\201Y !\205+\211J\212\350\201P \"b\210`W\203n\201Z `\330\"\206E\201[ `\330\"\204g\201\\ `\330\n$\210\203g\201\\ `\201S $\210\211b\266\2025)\266\211\f=\203\203\312 B\201] !)\202\234\341\350\201^ \"\201_ \350\211\201^ \"\201_ \"C\244#0\210+\262\266\203\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current looking-at "^Submodule \\([^ ]+\\)" match-string 1 nil "^Submodule [^ ]+ contains untracked content$" magit-delete-line t "^Submodule [^ ]+ contains modified content$" "^Submodule \\([^ ]+\\) \\([^ :]+\\)\\( (rewind)\\)?:$" 2 3 "^ \\([<>]\\) \\(.+\\)$" replace-regexp-in-string "[^.]\\(\\.\\.\\)[^.]" "..." magit-module-section class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-insert-heading propertize "modified " face magit-diff-file-heading " (" "rewind" "\\.\\.\\." string-match "non-ff" "new commits" ", " "modified" " and " "untracked" " content" ")" file-name-as-directory expand-file-name magit-toplevel inhibit-changing-match-data default-directory magit-section-cache-visibility magit-git-wash apply-partially magit-log-wash-log module "log" "--oneline" "--left-right" delete-char -1 run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children "^Submodule \\([^ ]+\\) \\([^ ]+\\) (\\([^)]+\\))$" "submodule " " content)"] 20]) | |
| 394 | (defalias 'magit-diff-wash-hunk #[0 "\306\307!\205\202\310\311!\310\312!\313\310\314!!B\315 \210\316\317!\203 \211\202( \211\236A\206( \320\321\317!\203? \322\"@\206@ \323\324\300#\202@ \325\326\327 \330 &\331\332\333\334\"\211\203Z \211\335=\202\214 \n\205e \336\337!\n\"\211\203p \340\332\"\202\212 \341 \"\211\205\210 \342!\203\205 \211!\262\211\335=\262\262\262#\210\211\n\206\236 ?\205\236 \f \3432}\211\344\345P\346\347#c\210\350 \210m\204\302 \306\351!\204\302 \352y\210\202\262 \331\353`#\210\331\354\355#\266\356\357!\210\360!\210\361\340\362\"\363\"\210\331\353\327 #\364\365\"\366\367\370\340\371\"\"!\366\367\372\340\371\"\"!\203J\206\373!\203J\206\373!\205\211J\212\340\362\"b\210`W\203P\374`\320\"\206/\375`\320\"\204I\376`\320\n$\210\203I\376`\365$\210\211b\266\202!)\266\211\f=\203c\352 @\377!)\202|\331\340\201A \"\201B \340\211\201A \"\201B \"C\244#0\210+\266\363\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current looking-at "^@\\{2,\\} \\(.+?\\) @\\{2,\\}\\(?: \\(.*\\)\\)?" match-string 0 2 split-string 1 magit-delete-line hunk class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section propertize "\n" face magit-diff-hunk-heading magit-insert-heading "^[^-+ \\]" nil end washer magit-diff-paint-hunk run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show magit-section-cache-visibility parent children] 15]) | |
| 395 | #@75 Keep new diff sections collapsed if washing takes too long. | |
| 396 | ||
| 397 | (fn SECTION) | |
| 398 | (defalias 'magit-diff-expansion-threshold #[257 "\302!\205 \303\304\305 \"! V\205 \306\207" [magit-refresh-start-time magit-diff-expansion-threshold magit-file-section-p float-time time-subtract current-time hide] 5 (#$ . 81901)]) | |
| 399 | (defvar magit-revision-mode-hook nil) | |
| 400 | (byte-code "\300\301N\204\f \302\300\301\303#\210\304\305!\204 \302\305\306\307#\210\300\207" [magit-revision-mode-hook variable-documentation put "Hook run after entering Magit Rev mode.\nNo problems result if this variable is not bound.\n`add-hook' automatically binds it. (This is true for all hook variables.)" boundp magit-revision-mode-map definition-name magit-revision-mode] 4) | |
| 401 | (defvar magit-revision-mode-map (make-sparse-keymap)) | |
| 402 | (byte-code "\301\302N\204 \303\301\302\304\305!#\210\306\307!\204 \303\307\310\311#\210\312\313 !\210\307\302N\204- \303\307\302\304\314!#\210\306\300!\204B \303\300\310\311#\210\315\316\300\317\"\210!\210\300\302N\204P \303\300\302\304\320!#\210\303\311\321\322#\210\303\311\323\324#\207" [magit-revision-mode-abbrev-table magit-revision-mode-map variable-documentation put purecopy "Keymap for `magit-revision-mode'." boundp magit-revision-mode-syntax-table definition-name magit-revision-mode (lambda (#1=#:def-tmp-var) (defvar magit-revision-mode-syntax-table #1#)) make-syntax-table "Syntax table for `magit-revision-mode'." (lambda (#1#) (defvar magit-revision-mode-abbrev-table #1#)) define-abbrev-table nil "Abbrev table for `magit-revision-mode'." derived-mode-parent magit-diff-mode custom-mode-group magit-revision] 5) | |
| 403 | #@828 Mode for looking at a Git commit. | |
| 404 | ||
| 405 | This mode is documented in info node `(magit)Revision Buffer'. | |
| 406 | ||
| 407 | \<magit-mode-map>Type \[magit-refresh] to refresh the current buffer. | |
| 408 | Type \[magit-section-toggle] to expand or hide the section at point. | |
| 409 | Type \[magit-visit-thing] to visit the hunk or file at point. | |
| 410 | ||
| 411 | Staging and applying changes is documented in info node | |
| 412 | `(magit)Staging and Unstaging' and info node `(magit)Applying'. | |
| 413 | ||
| 414 | \<magit-hunk-section-map>Type \[magit-apply] to apply the change at point, \[magit-stage] to stage, | |
| 415 | \[magit-unstage] to unstage, \[magit-discard] to discard, or \[magit-reverse] to reverse it. | |
| 416 | ||
| 417 | \{magit-revision-mode-map} | |
| 418 | ||
| 419 | In addition to any hooks its parent mode `magit-diff-mode' might have run, | |
| 420 | this mode runs the hook `magit-revision-mode-hook', as the final or penultimate step | |
| 421 | during initialization. | |
| 422 | (defalias 'magit-revision-mode #[0 "\306\300!\210\307\310 \210\311\312\310\313N\203 \314\311\313\310\313N#\210\315 !\204' \316 \317 \"\210\320\f!\211\2035 \211\321 =\203; \322\f\323 \"\210\210\324 \325\"\204R =\204R \326 \325 C#\210\327 !\210\330\f!\210 \331 \210\306\332!\210\333)\334\335!\207" [delay-mode-hooks major-mode mode-name magit-revision-mode-map magit-revision-mode-syntax-table magit-revision-mode-abbrev-table make-local-variable t magit-diff-mode magit-revision-mode "Magit Rev" mode-class put keymap-parent set-keymap-parent current-local-map char-table-parent standard-syntax-table set-char-table-parent syntax-table abbrev-table-get :parents abbrev-table-put use-local-map set-syntax-table hack-dir-local-variables-non-file-buffer bookmark-make-record-function magit-bookmark--revision-make-record run-mode-hooks magit-revision-mode-hook local-abbrev-table] 5 (#$ . 83530) nil]) | |
| 423 | #@30 | |
| 424 | ||
| 425 | (fn REV _CONST ARGS FILES) | |
| 426 | (defalias 'magit-revision-refresh-buffer #[1028 "\306\307\310!!\311G\211\312\267\202 \313\202& \314@P\202& \315\316\317\320#P\262R!\210\321!\322\323!\203: \211\202B \211 \236A\206B \324\325\323!\203Y \326 \"@\206Z \327\330\301#\202Z \331\313\332\333 \334\n&\335\336\337\340\"\211\203t \211\341=\202\246 \205 \342\343! \"\211\203\212 \344\336\"\202\244 \345\f\"\211\205\242 \346!\203\237 \211!\262\211\341=\262\262\262#\210\211 \206\270 \n?\205\270 ?\3472l\350\351\"\210\352\353!\210\354!\210\355\344\356\"\357\"\210\335\360\333 #\361\362\"\363\364\365\344\366\"\"!\363\364\367\344\366\"\"!\203\375 J\206\370!\203J\206\370!\205\211J\212\344\356\"b\210`W\203G\371`\324\"\206&\372`\324\"\204@\373`\324\n$\210\203@\373`\362$\210\211b\266\202)\266\211 =\203Z\313 @\374!)\202k\335\344\375\"\376\344\211\375\"\376\"C\244#0\210+\207" [magit-buffer-revision-hash magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-set-header-line-format capitalize magit-object-type " " #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (0 18 1 22)) nil " limited to file " " limited to files " mapconcat identity ", " magit-rev-parse commitbuf class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-run-section-hook magit-revision-sections-hook run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit-insert-section--current magit-section-cache-visibility] 17 (#$ . 85273)]) | |
| 427 | #@67 Insert the diff into this `magit-revision-mode' buffer. | |
| 428 | ||
| 429 | (fn REV) | |
| 430 | (defalias 'magit-insert-revision-diff #[257 "\302\303\"\304\305\306\307\310\311\312\313\314 8\235\205 \315\314 8 \316P\317\320 8& )\207" [magit-git-global-arguments magit-refresh-args remove "--literal-pathspecs" magit-git-wash #[257 "`\300y\210`|\210\301!\207" [3 magit-diff-wash-diffs] 3 "\n\n(fn ARGS)"] "show" "-p" "--cc" "--format=%n" "--no-prefix" "--stat" 2 "--numstat" "^{commit}" "--" 3] 14 (#$ . 87371)]) | |
| 431 | #@252 Insert tag message and headers into a revision buffer. | |
| 432 | This function only inserts anything when `magit-show-commit' is | |
| 433 | called with a tag as argument, when that is called with a commit | |
| 434 | or a ref which is not a branch, then it inserts nothing. | |
| 435 | ||
| 436 | (fn REV) | |
| 437 | (defalias 'magit-insert-revision-tag #[257 "\306!\307\232\205\267\310\311!\203 \211\202 \211\236A\206 \312\313\311!\2032 \314\"@\2063 \315\316\300#\2023 \317\320\321\322 \323 &\324\325\326\327\"\211\203M \211\330=\202 \n\205X \331\332!\n\"\211\203c \333\325\"\202} \334 \"\211\205{ \335!\203x \211!\262\211\330=\262\262\262#\210\211\n\206\221 ?\205\221 \f \3362\263`\337\340\307#\210\211b\210\341y\210\211`|\266\342\343!\210\344\345\346\347!\346\350!#\351 \210\352\353\354#c\266\355 \210\356\357\320\360#\203\353 \361\224\356\362!\210\211`|\266\363c\210\364@\320\360\320\365&\210\202\356 db\210\363c\210\366\367!\210\370!\210\371\333\372\"\360\"\210\324\373\322 #\374\375\"\376\344\377\333\201B \"\"!\376\344\201C \333\201B \"\"!\203.J\206E\201D !\203;J\206E\201D !\205E\211J\212\333\372\"b\210`W\203\204\201E `\312\"\206]\201F `\312\"\204}\201G `\312\n$\210\203}\201G `\375$\210\211b\266\202M)\266\211\f=\203\231\320 A\201H !)\202\262\324\333\201I \"\201J \333\211\201I \"\201J \"C\244#0\210+\262\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current magit-object-type "tag" taginfo class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-git-insert "cat-file" 3 looking-at "^tagger \\([^<]+\\) <\\([^>]+\\)" format "Tagger: %s <%s>" match-string 1 2 magit-delete-line propertize face magit-section-secondary-heading magit-insert-heading re-search-forward "-----BEGIN PGP SIGNATURE-----" t 0 "-----END PGP SIGNATURE-----" 10 process-file "verify-tag" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start end eieio-oref-default keymap intern "magit-%s-section-map" magit-git-executable magit-section-cache-visibility type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children] 14 (#$ . 87864)]) | |
| 438 | #@39 Keymap for `commit-message' sections. | |
| 439 | (defvar magit-commit-message-section-map (byte-code "\300 \301\302\303#\210\211\207" [make-sparse-keymap define-key [remap magit-visit-thing] magit-show-commit] 5) (#$ . 90390)) | |
| 440 | #@61 Insert the commit message into a revision buffer. | |
| 441 | ||
| 442 | (fn REV) | |
| 443 | (defalias 'magit-insert-revision-message #[257 "\306\307!\203 \211\202 \211\236A\206 \310\311\307!\203* \312\"@\206+ \313\314\300#\202+ \315\316\317\320 \321 &\322\323\324\325\"\211\203E \211\326=\202w \n\205P \327\330!\n\"\211\203[ \331\323\"\202u \332 \"\211\205s \333!\203p \211!\262\211\326=\262\262\262#\210\211\n\206\211 ?\205\211 \f \33421\211\322\335\336#\210`\212\337\340!r\211q\210\341\342\343\344\345!\346\"\347$\216\350\351\"\210\352 *\262)c\210`\347\\U\203\314 \353\347!\210\354c\210\202S\211b\210\212\355\356\316\357#\203\342 \342\224\342\224T|\210\202\320 )@\203\366 @\360 ^ A\361`\362 \"\210)B\203\212m\204\363\364\316\365#\210`\363\366\316\357#\210`V\203 \367`\"B\370\267\202x\211G\371Y\203\377\372\316\357 C\373#)\266\203\203\377\374\316\357 C\373#)\266\203\202y\211G\371Y\203\377\372\316\357 C\373#)\266\203\203\377\375!\202y\211G\371Y\203\377\375!\202y\375!\202y\316\203\377\376`\377\201F $\210`b\210\201G \307!\203\226\211\202\236\211\236A\206\236\310\311\307!\203\265\312\"@\206\266\313\314\300#\202\266\315\317\320 \321 &\322\323\324\325\"\211\203\321\211\326=\202\n\205\334\327\330!\n\"\211\203\347\331\323\"\202\332 \"\211\205\377\333!\203\374\211!\262\211\326=\262\262\262#\210\211\n\206 ?\205\f \3342\373b\210\201H \201I !\210\201J !\210\201K \331\201L \"\357\"\210\322\201M \320 #\201N \201O \"\201P \201Q \201R \331\201S \"\"!\201P \201Q \201T \331\201S \"\"!\203vJ\206\215\201U !\203\203J\206\215\201U !\205\215\211J\212\331\201L \"b\210`W\203\314\201V `\310\"\206\247\201W `\310\"\204\305\376`\310\n$\210\203\305\376`\201O $\210\211b\266\202\227)\266\211\f=\203\341\316 D\201X !)\202\372\322\331\201Y \"\201Z \331\211\201Y \"\201Z \"C\244#0\210+\266\210\210\202\374 )\212\316y\210\201[ `\201\\ #\210\201] \210)E\203P\212\363\201^ \316\357#\203O\342\224\342\225\376\377\201W \377\"\211\203D\211\201_ D\202G\201_ \262$\266\202 )db\210\266\201H \201I !\210\201J !\210\201K \331\201L \"\357\"\210\322\201M \320 #\201N \201O \"\201P \201Q \201R \331\201S \"\"!\201P \201Q \201T \331\201S \"\"!\203\254J\206\303\201U !\203\271J\206\303\201U !\205\303\211J\212\331\201L \"b\210`W\203\201V `\310\"\206\335\201W `\310\"\204\373\376`\310\n$\210\203\373\376`\201O $\210\211b\266\202\315)\266\211\f=\203\316 D\201X !)\2020\322\331\201Y \"\201Z \331\211\201Y \"\201Z \"C\244#0\210+\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current commit-message class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section heading-highlight-face magit-diff-hunk-heading-highlight generate-new-buffer " *temp*" make-byte-code 0 "\301\300!\205 \302\300!\207" vconcat vector [buffer-name kill-buffer] 2 magit-rev-insert-format "%B" magit-revision--wash-message backward-delete-char "(no message)\n" search-forward " \n" t window-width fill-region line-end-position re-search-forward "\\_<" move "\\_>" buffer-substring-no-properties #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (quickest 286 quicker 327 quick 357 slow 370)) 7 "[0-9]" string-match "[a-z]" magit-rev-verify-commit put-text-property face magit-revision-fill-summary-line fill-column magit-revision-use-hash-sections inhibit-changing-match-data magit-section-cache-visibility magit-diff-highlight-keywords magit-hash commit run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property magit-section-show parent children add-face-text-property magit-diff-hunk-heading magit-insert-heading "\\[[^[]*\\]" magit-keyword] 21 (#$ . 90613)]) | |
| 444 | #@55 Insert commit notes into a revision buffer. | |
| 445 | ||
| 446 | (fn REV) | |
| 447 | (defalias 'magit-insert-revision-notes #[257 "\306\307!\206 \310\311 \211\205\377\211@\312\313!\203 \211\202# \211\236A\206# \314\315\313!\203: \316\"@\206; \317\320\300#\202; \321\322\323 \324 &\325\326\327\330\"\211\203U \211\331=\202\220 \n\205` \332\333!\n\"\211\203k \334\326\"\202\216 \335 \"\211\203\206 \336!\203\200 \211!\262\211\331=\202\214 \232?\262\262\262#\210\211\n\206\242 ?\205\242 \f \3372\364\211\325\340\341#\210`\342\343!r\211q\210\344\345\346\347\350!\351\"\352$\216\353\354\355P\356\357%\210\360 *\262c\210`U\203\343 \361 \210\202\211b\210\362\210\363\364\365\366\367 \"\203\374 \370\362O\202\376 \371\372#\"c\210\362u\210\373`\374#\210\375 \210db\210\376c\210\266\377\201A !\210\201B !\210\201C \334\201D \"\201E \"\210\325\201F \323 #\201G \201H \"\201I \363\201J \334\201K \"\"!\201I \363\201L \334\201K \"\"!\203kJ\206\202\201M !\203xJ\206\202\201M !\205\202\211J\212\334\201D \"b\210`W\203\305\201N `\314\"\206\234\201O `\314\"\204\276\201P `\314\n$\210\203\276\201P `\201H $\210\211b\266\202\214)\266\211\f=\203\332\362 @\201Q !)\202\363\325\334\201R \"\201S \334\211\201R \"\201S \"C\244#0\210+\266A\266\202\202\n \262\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current "core.notesRef" magit-get "refs/notes/commits" magit-list-active-notes-refs notes class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section heading-highlight-face magit-diff-hunk-heading-highlight generate-new-buffer " *temp*" make-byte-code 0 "\301\300!\205 \302\300!\207" vconcat vector [buffer-name kill-buffer] 2 magit-git-insert "-c" "core.notesRef=" "notes" "show" magit-revision--wash-message magit-cancel-section nil format " (%s)" propertize string-prefix-p "refs/notes/" 11 face magit-refname add-face-text-property magit-diff-hunk-heading magit-insert-heading 10 run-hooks magit-section-cache-visibility magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children] 18 (#$ . 94891)]) | |
| 448 | (defalias 'magit-revision--wash-message #[0 "\302\303 \210\304 \210) \305>\204 \210\306 \210\307 \207" [major-mode git-commit-major-mode git-commit-mode hack-dir-local-variables hack-local-variables-apply (nil text-mode) font-lock-ensure buffer-string] 2]) | |
| 449 | #@67 Insert headers about the commit into a revision buffer. | |
| 450 | ||
| 451 | (fn REV) | |
| 452 | (defalias 'magit-insert-revision-headers #[257 "\306\307!\203 \211\202 \211\236A\206 \310\311\307!\203* \312\"@\206+ \313\314\300#\202+ \315\316\317\320 \321 &\322\323\324\325\"\211\203E \211\326=\202w \n\205P \327\330!\n\"\211\203[ \331\323\"\202u \332 \"\211\205s \333!\203p \211!\262\211\326=\262\262\262#\210\211\n\206\211 ?\205\211 \f \3342F\335\336\337#\211\203\240 \340!\341\261\210\210\342\343\344P!\345\346#c\210\347 \210`\350@\"\210\351\"\266A\203\202\352!\211\203L\211@\353\307!\203\325 \211\202\335 \211\236A\206\335 \310\311\307!\203\364 \312\"@\206\365 \313\314\300#\202\365 \315\317\320 \321 &\322\323\324\325\"\211\203\211\326=\202A\n\205\327\330!\n\"\211\203%\331\323\"\202?\332 \"\211\205=\333!\203:\211!\262\211\326=\262\262\262#\210\211\n\206S ?\205S\f \3342A\335\354\"\355\356\"\210\211\357\360\"\357\361\"\362c\210\342\345\346#c\210\363\364\261\266\365\366!\210\367!\210\370\331\371\"\372\"\210\322\373\320 #\374\375\"\376\377\201C \331\201D \"\"!\376\377\201E \331\201D \"\"!\203\274J\206\323\201F !\203\311J\206\323\201F !\205\323\211J\212\331\371\"b\210`W\203\201G `\310\"\206\353\201H `\310\"\204 \201I `\310\n$\210\203 \201I `\375$\210\211b\266\202\333)\266\211\f=\203'\316 B\201J !)\202@\322\331\201K \"\201L \331\211\201K \"\201L \"C\244#0\210+\266A\266\202\202\304 \210\201M \201N \201O A\201P =$\210\201M \201Q \201R A\201S =$\210\201T \372\"\211\203\366\211@A@\201U \307!\203\215\211\202\225\211\236A\206\225\310\311\307!\203\254\312\"@\206\255\313\314\300#\202\255\315\317\320 \321 &\322\323\324\325\"\211\203\310\211\326=\202\372\n\205\323\327\330!\n\"\211\203\336\331\323\"\202\370\332 \"\211\205\366\333!\203\363\211!\262\211\326=\262\262\262#\210\211\n\206\f ?\205\f\f \3342\362\377\201V \342\345\201W #\342\201X !\345\201Y ##c\210\365\366!\210\367!\210\370\331\371\"\372\"\210\322\373\320 #\374\375\"\376\377\201C \331\201D \"\"!\376\377\201E \331\201D \"\"!\203mJ\206\204\201F !\203zJ\206\204\201F !\205\204\211J\212\331\371\"b\210`W\203\303\201G `\310\"\206\234\201H `\310\"\204\274\201I `\310\n$\210\203\274\201I `\375$\210\211b\266\202\214)\266\211\f=\203\330\316 B\201J !)\202\361\322\331\201K \"\201L \331\211\201K \"\201L \"C\244#0\210+\266\210\201Z \372\"\211\203|\211@A@\201U \307!\203\211\202\211\236A\206\310\311\307!\2032\312\"@\2063\313\314\300#\2023\315\317\320 \321 &\322\323\324\325\"\211\203N\211\326=\202\200\n\205Y\327\330!\n\"\211\203d\331\323\"\202~\332 \"\211\205|\333!\203y\211!\262\211\326=\262\262\262#\210\211\n\206\222 ?\205\222\f \3342x\377\201[ \342\345\201W #\342\201X !\345\201W ##c\210\365\366!\210\367!\210\370\331\371\"\372\"\210\322\373\320 #\374\375\"\376\377\201C \331\201D \"\"!\376\377\201E \331\201D \"\"!\203\363J\206\n\201F !\203 J\206\n\201F !\205\n\211J\212\331\371\"b\210`W\203I\201G `\310\"\206\"\201H `\310\"\204B\201I `\310\n$\210\203B\201I `\375$\210\211b\266\202)\266\211\f=\203^\316 B\201J !)\202w\322\331\201K \"\201L \331\211\201K \"\201L \"C\244#0\210+\266\210\201\\ c\210\365\366!\210\367!\210\370\331\371\"\372\"\210\322\373\320 #\374\375\"\376\377\201C \331\201D \"\"!\376\377\201E \331\201D \"\"!\203\301J\206\330\201F !\203\316J\206\330\201F !\205\330\211J\212\331\371\"b\210`W\203\201G `\310\"\206\360\201H `\310\"\204\201I `\310\n$\210\203\201I `\375$\210\211b\266\202\340)\266\211\f=\203,\316 B\201J !)\202E\322\331\201K \"\201L \331\211\201K \"\201L \"C\244#0\210+\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current headers class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-rev-format "%d" "--decorate=full" magit-format-ref-labels 32 propertize magit-rev-parse "^{commit}" face magit-hash magit-insert-heading magit-rev-insert-format magit-insert-revision-gravatars magit-commit-parents commit "%h %s" string-match "^\\([^ ]+\\) \\(.*\\)" match-string 1 2 "Parent: " " " "\n" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern format magit-revision-headers-format magit-revision-insert-related-refs magit-section-cache-visibility "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit--insert-related-refs "--merged" "Merged" all "--contains" "Contained" (all mixed) magit-get-current-tag tag "Follows: %s (%s)\n" magit-tag number-to-string magit-branch-local magit-get-next-tag "Precedes: %s (%s)\n" 10] 19 (#$ . 97789)]) | |
| 453 | #@29 | |
| 454 | ||
| 455 | (fn REV ARG TITLE REMOTE) | |
| 456 | (defalias 'magit--insert-related-refs #[1028 "\306\205 \307#\211\205\232\310\311\312GZ\313\"\261\210\211\211\203\227\211@\314i\315G#\316 X\2033 \313c\210\202; \312\311\317\313\"\261\210\320\321!\203F \211\202N \211\236A\206N \322\323\321!\203e \324\"@\206f \325\326\300#\202f \327\330\331 \332 &\333\334\335\336\"\211\203\200 \211\337=\202\262 \n\205\213 \340\341!\n\"\211\203\226 \342\334\"\202\260 \343 \"\211\205\256 \344!\203\253 \211!\262\211\337=\262\262\262#\210\211\n\206\304 ?\205\304 \f \3452\214\346\347\350\351\"\203\332 \352\202\333 \353#c\210\354\355!\210\356!\210\357\342\360\"\361\"\210\333\362\331 #\363\364\"\365\366\367\342\370\"\"!\365\366\371\342\370\"\"!\203J\206(\372!\203 J\206(\372!\205(\211J\212\342\360\"b\210`W\203_\373`\322\"\206>\374`\322\"\204X\375`\322\n$\210\203X\375`\364$\210\211b\266\2020)\266\211\f=\203r\376 @\377!)\202\213\333\342\201A \"\201B \342\211\201A \"\201B \"C\244#0\210+\266A\266\202\202 \210\312c\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current magit-list-related-branches "-a" ":" make-string 10 32 + 1 window-width 12 branch class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section propertize face string-prefix-p "remotes/" magit-branch-remote magit-branch-local run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property nil magit-section-show magit-section-cache-visibility parent children] 20 (#$ . 103039)]) | |
| 457 | #@16 | |
| 458 | ||
| 459 | (fn REV BEG) | |
| 460 | (defalias 'magit-insert-revision-gravatars #[514 "\205Y \301 \205Y \302\303!\210\304\267\202 \305\202 \306\202 \307\202 \211@A\211\211\205/ \310\311\"\211\203< \312 $\210\210\205F \310\313\"\211\205S \312 $\262\266\202\266\203\207" [magit-revision-show-gravatars window-system require gravatar #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (t 19 author 23 committer 27)) ("^Author: " . "^Commit: ") ("^Author: ") (nil . "^Commit: ") magit-rev-format "%aE" magit-insert-revision-gravatar "%cE"] 13 (#$ . 105097)]) | |
| 461 | #@29 | |
| 462 | ||
| 463 | (fn BEG REV EMAIL REGEXP) | |
| 464 | (defalias 'magit-insert-revision-gravatar #[1028 "\212b\210\301\302\303#\205L \304\305!G\306\307`\310 \"!\211\311H\312H\\\313_\314\315\316\317H\320#!\321#\313Z\3221G \323\324 \325 F#0\202I \210\302)\266\204)\207" [gravatar-size re-search-forward nil t match-string 0 query-font font-at get-buffer-window 4 5 2 + ceiling / 7 1.0 1 (error) gravatar-retrieve magit-insert-revision-gravatar-cb point-marker] 15 (#$ . 105712)]) | |
| 465 | #@41 | |
| 466 | ||
| 467 | (fn IMAGE REV MARKER ALIGN-TO COLUMN) | |
| 468 | (defalias 'magit-insert-revision-gravatar-cb #[1285 "\303=?\205p \304!\211\205n r\211q\210\212b\210@\232\205m \305`\306\"\242\242\307=?\205m \310\311\"\312B\310\313\"\314B\315\316EC \203G \262\262\317\320\321\306#c\210\320\321\306#c\210\322y\210u\210\320\321\306#c\210\320\321\306#c)\266\203*\262\207" [magit-refresh-args magit-revision-use-gravatar-kludge inhibit-read-only error marker-buffer get-text-property display image append (:ascent center :relief 1) ((slice 0.0 0.0 1.0 0.5)) (:ascent center :relief 1) ((slice 0.0 0.5 1.0 1.0)) space :align-to t propertize " " nil] 13 (#$ . 106184)]) | |
| 469 | #@36 Keymap for the `unstaged' section. | |
| 470 | (defvar magit-unstaged-section-map (byte-code "\300 \301\302\303#\210\301\304\305#\210\301\306\307#\210\301\310\311#\210\211\207" [make-sparse-keymap define-key [remap magit-visit-thing] magit-diff-unstaged [remap magit-delete-thing] magit-discard "s" magit-stage "u" magit-unstage] 5) (#$ . 106849)) | |
| 471 | #@103 Jump to the section "Unstaged changes". | |
| 472 | With a prefix argument also expand it. | |
| 473 | ||
| 474 | (fn &optional EXPAND) | |
| 475 | (defalias 'magit-jump-to-unstaged #[256 "\303\304\305B\306!B!\211\2032 \307\310\"b\210\2055 \3111% \305\312!)0\202+ \210\313\314\315!\210\316\317!\2025 \320\321!\207" [magit-root-section inhibit-quit quit-flag magit-get-section unstaged nil magit-section-ident eieio-oref start (quit) magit-section-show t eval (ignore nil) recenter 0 message "Section \"Unstaged changes\" wasn't found"] 5 (#$ . 107196) "P"]) | |
| 476 | #@42 Insert section showing unstaged changes. | |
| 477 | (defalias 'magit-insert-unstaged-changes #[0 "\306\307!\203 \211\202 \211\236A\206 \310\311\307!\203* \312\"@\206+ \313\314\300#\202+ \315\316\317\320 \321 &\322\323\324\325\"\211\203E \211\326=\202w \n\205P \327\330!\n\"\211\203[ \331\323\"\202u \332 \"\211\205s \333!\203p \211!\262\211\326=\262\262\262#\210\211\n\206\211 ?\205\211 \f \3342F\335\336!\210\337\340\3419\342\343:&\210\344\345!\210\346!\210\347\331\350\"\351\"\210\322\352\320 #\353\354\"\355\356\357\331\360\"\"!\355\356\361\331\360\"\"!\203\327 J\206\352 \362!\203\342 J\206\352 \362!\205\352 \211J\212\331\350\"b\210`W\203!\363`\310\"\206 \364`\310\"\204\365`\310\n$\210\203\365`\354$\210\211b\266\202\362 )\266\211\f=\2034\316 ;\366!)\202E\322\331\367\"\370\331\211\367\"\370\"C\244#0\210+\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current unstaged class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-insert-heading "Unstaged changes:" magit-git-wash magit-diff-wash-diffs "diff" "--no-prefix" "--" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit-diff-section-arguments magit-diff-section-file-args magit-section-cache-visibility] 13 (#$ . 107720)]) | |
| 478 | #@34 Keymap for the `staged' section. | |
| 479 | (defvar magit-staged-section-map (byte-code "\300 \301\302\303#\210\301\304\305#\210\301\306\307#\210\301\310\311#\210\301\312\313#\210\211\207" [make-sparse-keymap define-key [remap magit-visit-thing] magit-diff-staged [remap magit-delete-thing] magit-discard [remap magit-revert-no-commit] magit-reverse "s" magit-stage "u" magit-unstage] 5) (#$ . 109593)) | |
| 480 | #@101 Jump to the section "Staged changes". | |
| 481 | With a prefix argument also expand it. | |
| 482 | ||
| 483 | (fn &optional EXPAND) | |
| 484 | (defalias 'magit-jump-to-staged #[256 "\303\304\305B\306!B!\211\2032 \307\310\"b\210\2055 \3111% \305\312!)0\202+ \210\313\314\315!\210\316\317!\2025 \320\321!\207" [magit-root-section inhibit-quit quit-flag magit-get-section staged nil magit-section-ident eieio-oref start (quit) magit-section-show t eval (ignore nil) recenter 0 message "Section \"Staged changes\" wasn't found"] 5 (#$ . 109997) "P"]) | |
| 485 | #@40 Insert section showing staged changes. | |
| 486 | (defalias 'magit-insert-staged-changes #[0 "\306 ?\205Q\307\310!\203 \211\202 \211\236A\206 \311\312\310!\2030 \313\"@\2061 \314\315\300#\2021 \316\317\320\321 \322 &\323\324\325\326\"\211\203K \211\327=\202} \n\205V \330\331!\n\"\211\203a \332\324\"\202{ \333 \"\211\205y \334!\203v \211!\262\211\327=\262\262\262#\210\211\n\206\217 ?\205\217 \f \3352M\336\337!\210\340\341\342\343;\344\345<&\210\346\347!\210\350!\210\351\332\352\"\353\"\210\323\354\321 #\355\356\"\357\360\361\332\362\"\"!\357\360\363\332\362\"\"!\203\336 J\206\361 \364!\203\351 J\206\361 \364!\205\361 \211J\212\332\352\"b\210`W\203(\365`\311\"\206\366`\311\"\204!\367`\311\n$\210\203!\367`\356$\210\211b\266\202\371 )\266\211\f=\203;\317 =\370!)\202L\323\332\371\"\372\332\211\371\"\372\"C\244#0\210+\262\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current magit-bare-repo-p staged class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-insert-heading "Staged changes:" magit-git-wash magit-diff-wash-diffs "diff" "--cached" "--no-prefix" "--" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit-diff-section-arguments magit-diff-section-file-args magit-section-cache-visibility] 13 (#$ . 110513)]) | |
| 487 | #@1076 Return the diff type of SECTION. | |
| 488 | ||
| 489 | The returned type is one of the symbols `staged', `unstaged', | |
| 490 | `committed', or `undefined'. This type serves a similar purpose | |
| 491 | as the general type common to all sections (which is stored in | |
| 492 | the `type' slot of the corresponding `magit-section' struct) but | |
| 493 | takes additional information into account. When the SECTION | |
| 494 | isn't related to diffs and the buffer containing it also isn't | |
| 495 | a diff-only buffer, then return nil. | |
| 496 | ||
| 497 | Currently the type can also be one of `tracked' and `untracked' | |
| 498 | but these values are not handled explicitly everywhere they | |
| 499 | should be and a possible fix could be to just return nil here. | |
| 500 | ||
| 501 | The section has to be a `diff' or `hunk' section, or a section | |
| 502 | whose children are of type `diff'. If optional SECTION is nil, | |
| 503 | return the diff type for the current section. In buffers whose | |
| 504 | major mode is `magit-diff-mode' SECTION is ignored and the type | |
| 505 | is determined using other means. In `magit-revision-mode' | |
| 506 | buffers the type is always `committed'. | |
| 507 | ||
| 508 | Do not confuse this with `magit-diff-scope' (which see). | |
| 509 | ||
| 510 | (fn &optional SECTION) | |
| 511 | (defalias 'magit-diff-type #[256 "\211\206 \301 \211\205\316 \302\303\304\"\203 \305\202\316 \302\306!\203] @A@\307\235\203* \310\202X \2035 \311\312\"\203C \313\235\203? \314\202X \315\202X \313\235\203W \316!\203S \314\202X \310\202X \305\266\202\202\316 \302\317!\203\252 \320\321\"\211\322>\203q \211\202\245 \211\323>\203\221 \320\324\"\320\321\"\211\325>\203\213 \326!\202\214 \211\266\202\202\245 \211\327=\203\244 \320\211\211\324\"\324\"\321\"\202\245 \330\262\202\316 \302\331!\203\315 \332\333\"\203\276 \320\334\"\204\305 \332\335\"\203\311 \305\202\316 \310\202\316 \310\207" [magit-refresh-args magit-current-section derived-mode-p magit-revision-mode magit-stash-mode committed magit-diff-mode "--no-index" undefined magit-rev-eq "HEAD" "--cached" staged unstaged magit-rev-head-p magit-status-mode eieio-oref type (staged unstaged tracked untracked) (module file) parent (file module) magit-diff-type hunk nil magit-log-mode magit-section-match commit children [* file commit]] 8 (#$ . 112430)]) | |
| 512 | #@1060 Return the diff scope of SECTION or the selected section(s). | |
| 513 | ||
| 514 | A diff's "scope" describes what part of a diff is selected, it is | |
| 515 | a symbol, one of `region', `hunk', `hunks', `file', `files', or | |
| 516 | `list'. Do not confuse this with the diff "type", as returned by | |
| 517 | `magit-diff-type'. | |
| 518 | ||
| 519 | If optional SECTION is non-nil, then return the scope of that, | |
| 520 | ignoring the sections selected by the region. Otherwise return | |
| 521 | the scope of the current section, or if the region is active and | |
| 522 | selects a valid group of diff related sections, the type of these | |
| 523 | sections, i.e. `hunks' or `files'. If SECTION, or if that is nil | |
| 524 | the current section, is a `hunk' section; and the region region | |
| 525 | starts and ends inside the body of a that section, then the type | |
| 526 | is `region'. If the region is empty after a mouse click, then | |
| 527 | `hunk' is returned instead of `region'. | |
| 528 | ||
| 529 | If optional STRICT is non-nil, then return nil if the diff type of | |
| 530 | the section at point is `untracked' or the section at point is not | |
| 531 | actually a `diff' but a `diffstat' section. | |
| 532 | ||
| 533 | (fn &optional (SECTION nil SSECTION) STRICT) | |
| 534 | (defalias 'magit-diff-scope #[128 "\211\205 \300\211A\262\242\211A\262\242\203 \301\302\303\304G\\D\"\210?\205) \305\306\300\"\2064 \211@\2064 \307 \262\205\236\203[ \310!\311=?\205\236\312\313\"\211\205S \312\314\"\262\315=?\205\236\312\314\"\205d \300\316 F\211:\205\234\211@\211\317=\203JA\211:\205E\211@\211\204\315 A\211:\205\310 \211@\211\300=\203\263 A\211:\205\256 \211A\211?\205\254 \320 !\203\253 \321\202\254 \317\262\262\202\306 A\211:\205\304 \211A\211?\205\302 \317\262\262\262\262\202C\211\300=\203'A\211:\205\"\211@\211\300=\203 A\211:\205\211@\211\204\374 A\211?\205\367 \322\262\202A\211?\205\317\262\262\262\202 A\211:\205 \211A\211?\205 \317\262\262\262\262\202CA\211:\205A\211A\211:\205?\211A\211?\205=\317\262\262\262\262\262\202\232\211\323=\203\326A\211:\205\321\211@\211\300=\203\263A\211:\205\256\211@\211\300=\203\231A\211:\205\224\211@\211\204\210A\211?\205\203\324\262\202\222A\211?\205\220\323\262\262\262\202\254A\211:\205\252\211A\211?\205\250\323\262\262\262\262\202\317A\211:\205\315\211A\211:\205\313\211A\211?\205\311\323\262\262\262\262\262\202\232\211\325=\203bA\211:\205]\211@\211\300=\203?A\211:\205:\211@\211\300=\203%A\211:\205 \211@\211\204A\211?\205\324\262\202 A\211?\205 \323\262\262\262\2028A\211:\2056\211A\211?\2054\323\262\262\262\262\202[A\211:\205Y\211A\211:\205W\211A\211?\205U\323\262\262\262\262\262\202\232\211\326>\203\231A\211:\205\224\211@\211?\205\222A\211:\205\220\211A\211:\205\216\211A\211?\205\214\327\262\262\262\262\262\202\232\306\262\262\262\207" [t signal wrong-number-of-arguments magit-diff-scope 2 magit-region-sections nil magit-current-section magit-diff-type untracked eieio-oref parent type diffstat magit-diff-use-hunk-region-p hunk magit-section-internal-region-p region hunks file files module (untracked unstaged staged) list] 15 (#$ . 114544)]) | |
| 535 | (defalias 'magit-diff-use-hunk-region-p #[0 "\303 \205* \304\305\"\203 \306=\202! \306=\204$ \n\306=\204$ \307\n!\205) \310 \311 =?\207" [emacs-version this-command last-command region-active-p version< "25.1" mouse-drag-region byte-code-function-p region-end region-beginning] 3]) | |
| 536 | #@78 Remove the highlighting of the diff-related SECTION. | |
| 537 | ||
| 538 | (fn SECTION SELECTION) | |
| 539 | (defalias 'magit-diff-unhighlight #[514 "\300!\205 \301\302#\210\303\207" [magit-hunk-section-p magit-diff-paint-hunk nil t] 6 (#$ . 117892)]) | |
| 540 | #@274 Highlight the diff-related SECTION. | |
| 541 | If SECTION is not a diff-related section, then do nothing and | |
| 542 | return nil. If SELECTION is non-nil, then it is a list of sections | |
| 543 | selected by the region, including SECTION. All of these sections | |
| 544 | are highlighted. | |
| 545 | ||
| 546 | (fn SECTION SELECTION) | |
| 547 | (defalias 'magit-diff-highlight #[514 "\300\301\"\203/ \302\303\"\203/ \211\203) \211\211\203% \211@\304\"\210A\266\202\202 \210\202- \304!\210\305\207\306\305\"\211\205f \211\307=\203F \310\305#\210\202e \203a \211\203] \211@\311\"\210A\266\202\202K \210\202e \311!\210\305\207" [magit-section-match commit eieio-oref children magit-diff-highlight-list t magit-diff-scope region magit-diff-paint-hunk magit-diff-highlight-recursive] 8 (#$ . 118123)]) | |
| 548 | #@36 | |
| 549 | ||
| 550 | (fn SECTION &optional SELECTION) | |
| 551 | (defalias 'magit-diff-highlight-recursive #[513 "\300!\211\301\267\202$ \302\"\202( \303\"\202( \304\"\210\305\306#\202( \307\310\"\207" [magit-diff-scope #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (list 9 file 16 hunk 23)) magit-diff-highlight-list magit-diff-highlight-file magit-diff-highlight-heading magit-diff-paint-hunk t magit-section-highlight nil] 7 (#$ . 118870)]) | |
| 552 | #@36 | |
| 553 | ||
| 554 | (fn SECTION &optional SELECTION) | |
| 555 | (defalias 'magit-diff-highlight-list #[513 "\302\303\"\302\304\"\302\305\"\306=\204 \204\\ \307 \203\" \310 X\204( \311\312#\210\302\313\"\204\\ \302\314\"\211\203[ \211@\306=\204N \307 \203N \310 \302\303\"X\204T \315\"\210A\266\202\2023 \210 \205f \311S\312#\207" [this-command magit-diff-highlight-hunk-body eieio-oref start content end mouse-drag-region region-active-p region-beginning magit-section-make-overlay magit-section-highlight hidden children magit-diff-highlight-recursive] 11 (#$ . 119339)]) | |
| 556 | #@36 | |
| 557 | ||
| 558 | (fn SECTION &optional SELECTION) | |
| 559 | (defalias 'magit-diff-highlight-file #[513 "\300\"\210\301\302\"?\205% \301\303\"\211\205# \211@\304\"\210A\266\202\202 \262\207" [magit-diff-highlight-heading eieio-oref hidden children magit-diff-highlight-recursive] 7 (#$ . 119908)]) | |
| 560 | #@36 | |
| 561 | ||
| 562 | (fn SECTION &optional SELECTION) | |
| 563 | (defalias 'magit-diff-highlight-heading #[513 "\301\302\303\"\302\304\"\206 \302\305\"\302\306\"\235\205 \307=?D\211:\205\316 \211@\211\310\267\202\313 A\211:\205\\ \211@\211\311=\203H A\211?\205C \312\262\202Z \211\204Y A\211?\205T \313\262\202Z \314\262\262\202\314 A\211:\205\221 \211@\211\311=\203} A\211?\205x \312\262\202\217 \211\204\216 A\211?\205\211 \313\262\202\217 \314\262\262\202\314 A\211:\205\306 \211@\211\311=\203\262 A\211?\205\255 \315\262\202\304 \211\204\303 A\211?\205\276 \316\262\202\304 \314\262\262\202\314 \314\262\262#\207" [this-command magit-section-make-overlay eieio-oref start content end type mouse-drag-region #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (file 44 module 97 hunk 150)) t magit-diff-file-heading-selection magit-diff-file-heading-highlight nil magit-diff-hunk-heading-selection magit-diff-hunk-heading-highlight] 11 (#$ . 120195)]) | |
| 564 | #@93 | |
| 565 | ||
| 566 | (fn SECTION &optional SELECTION (HIGHLIGHT (magit-section-selected-p section selection))) | |
| 567 | (defalias 'magit-diff-paint-hunk #[641 "\211\203 \211A\262\242\202 \304\"\203 \305\306\307\310G\\D\"\210\311\204' \311\262\203P \312\313\"\204n \314\315\"\210 >\203F \316 \"\202n \203n \317\262\202n \312\313\"\203k >\203k \314\315\"\210\316 \"\202n \317\262\211\203\371\212\312\320\"b\210\312\321\"\322\323!\311\324\325 !!\311y\210`W\203\365 \203\255 \326\327\330 \206\235 `Sf\"\203\255 \331\330 S\330 \332\317$\210\331`\330 T\333\322\334!\203\220\335\336! D\211:\205\210\211@\211\337\267\202\205A\211:\205\374 \211@\211\204\346 A\211?\205\341 \340\262\202\372 \211\317=\203\371 A\211?\205\364 \341\262\202\372 \311\262\262\202\206A\211:\2051\211@\211\204A\211?\205\342\262\202/\211\317=\203.A\211?\205)\343\262\202/\311\262\262\202\206A\211:\205f\211@\211\204PA\211?\205K\344\262\202d\211\317=\203cA\211?\205^\345\262\202d\311\262\262\202\206A\211:\205\200\211@\211?\205~A\311\262\262\262\202\206\311\262\262\262\346\202\355\322\203\232\347\202\233\350!\203\273\351\n\"\210\352!\210\206\355\203\267\353\202\355\354\202\355\322\203\305\355\202\306\356!\203\335\351\n\"\210\203\331\357\202\355\360\202\355\351\n\"\210\203\354\361\202\355\362$\210\311y\210\202\213 )\266)\210\363!\207" [magit-diff-highlight-hunk-body magit-section-unhighlight-sections tab-width magit-diff-hide-trailing-cr-characters magit-section-selected-p signal wrong-number-of-arguments magit-diff-paint-hunk 3 nil eieio-oref hidden add-to-list magit-section-highlighted-sections delq t start end looking-at "@@@" magit-diff-tab-width magit-section-parent-value char-equal 13 line-end-position put-text-property invisible face "^\\+\\+?\\([<=|>]\\)\\{7\\}" match-string 1 #s(hash-table size 4 test equal rehash-size 1.5 rehash-threshold 0.8125 purecopy t data ("<" 204 "|" 257 "=" 310 ">" 363)) magit-diff-our magit-diff-our-highlight magit-diff-base magit-diff-base-highlight magit-diff-their magit-diff-their-highlight magit-diff-conflict-heading "^\\(\\+\\| \\+\\)" "^\\+" magit-diff-paint-tab magit-diff-paint-whitespace magit-diff-added-highlight magit-diff-added "^\\(-\\| -\\)" "^-" magit-diff-removed-highlight magit-diff-removed magit-diff-context-highlight magit-diff-context magit-diff-update-hunk-refinement] 18 (#$ . 121191)]) | |
| 568 | (defvar magit-diff--tab-width-cache nil) | |
| 569 | #@13 | |
| 570 | ||
| 571 | (fn FILE) | |
| 572 | (defalias 'magit-diff-tab-width #[257 "\211C\211\303\242!\240\210\304\204 \202d \305\242!\211\205! \306\301\"\"\262\206d \307\242\n\"\211\2055 \211A\2065 \262\206d \310=\204P \247\203^ \311\312\242!8Y\203^ \211\306\301\313\242!\"\"\202d \211\314\"\210 \262\207" [magit-diff-adjust-tab-width tab-width magit-diff--tab-width-cache expand-file-name #[514 "\301\242\"\211\203 \211\241\210\202 \242BB\210\207" [magit-diff--tab-width-cache assoc] 5 "\n\n(fn FILE VALUE)"] find-buffer-visiting buffer-local-value assoc always 7 file-attributes find-file-noselect nil] 9 (#$ . 123668)]) | |
| 573 | #@22 | |
| 574 | ||
| 575 | (fn MERGING WIDTH) | |
| 576 | (defalias 'magit-diff-paint-tab #[514 "\212\203 \300\202\n \301u\210\302f\303U\205& \304``T\305\306\307EC$\210\302u\210\202\f )\207" [2 1 nil 9 put-text-property display space :width] 9 (#$ . 124295)]) | |
| 577 | #@16 | |
| 578 | ||
| 579 | (fn MERGING) | |
| 580 | (defalias 'magit-diff-paint-whitespace #[257 "\205\300 \305\306!\204 \307=?\205\300 \211\203 \310\202 \311\312\301!\203$ \202k \313\301!\210\314\315\301!\237\316\317\203c \203c @\203C \314\262\202W \211@\n\314\316\320#)\266\203\203W \211\262\210\211T\262A\262\202/ \266\211\262A\211\f\203\214 \321\322P!\203\214 \323\324\224\324\225\314\316$\325\326\327#\210\325\330\316#\266\211\331=\203\232 \321\332P!\204\251 \211\250\205\276 \321\333\334#!\205\276 \323\324\224\324\225\314\316$\325\326\327#\210\325\330\316#\262\266\202\207" [magit-diff-paint-whitespace magit-diff-highlight-indentation default-directory inhibit-changing-match-data magit-diff-highlight-trailing derived-mode-p magit-status-mode status "^[-\\+ ]\\{2\\}" "^[-\\+]" local-variable-p make-local-variable nil default-value t 0 string-match looking-at ".*?\\([ ]+\\)$" make-overlay 1 overlay-put face magit-diff-whitespace-warning evaporate tabs "\\( * [ ]*\\)" format "%s\\([ ]* \\{%s,\\}[ ]*\\)"] 14 (#$ . 124528)]) | |
| 581 | #@26 | |
| 582 | ||
| 583 | (fn &optional SECTION) | |
| 584 | (defalias 'magit-diff-update-hunk-refinement #[256 "\211\203\355 \302\303\"?\205\302\304\"\305 =E\306\307:\205\354 @\211\310=\203P A\211:\205K \211@\211?\205I A\211:\205G \211A\211?\205E !\262\262\262\262\202\352 \211\311=\203\270 A\211:\205\263 \211@\211\204\207 A\211:\205\202 \211@\211\311=\205\200 A\211?\205~ \n!\262\262\262\202\261 \211\311=\203\260 A\211:\205\253 \211@\211?\205\251 A\211?\205\247 \n!\262\262\262\202\261 \312\262\262\202\352 \211\204\351 A\211:\205\344 \211@\211\311=\205\342 A\211:\205\340 \211A\211?\205\336 !\262\262\262\262\202\352 \312\262\207\312C\211\313\314\315\316\317!\320\"\321\322%\240\210\211\242 !\262\207" [magit-diff-refine-hunk magit-root-section eieio-oref hidden refined magit-current-section #[257 "\300\301\302#\210\303\304\305\"\304\306\"\307\310$\207" [eieio-oset refined nil remove-overlays eieio-oref start end diff-mode fine] 6 "\n\n(fn SECTION)"] #[257 "\301\302\303#\210\212\304\305\"b\210\306\307!?\205 \303\310 ))\207" [write-region-inhibit-fsync eieio-oset refined t eieio-oref start looking-at "@@@" diff-refine-hunk] 5 "\n\n(fn SECTION)"] all t nil make-byte-code 257 "\301\302\"\203 \303!\207\304\305\"\211\205! \211@\300\242!\210A\266\202\202 \207" vconcat vector [magit-section-match hunk magit-diff-update-hunk-refinement eieio-oref children] 5 "\n\n(fn SECTION)"] 12 (#$ . 125569)]) | |
| 585 | (defalias 'magit-diff-hunk-region-beginning #[0 "\212\300 b\210\301 )\207" [region-beginning line-beginning-position] 1]) | |
| 586 | (defalias 'magit-diff-hunk-region-end #[0 "\212\300 b\210\301 )\207" [region-end line-end-position] 1]) | |
| 587 | #@58 Highlight the hunk-internal region if any. | |
| 588 | ||
| 589 | (fn SECTION) | |
| 590 | (defalias 'magit-diff-update-hunk-region #[257 "\300\301\"\302=\205' \303\304\305\"\304\306\"S\307\310\311\312!\313\314\310!&\210\315\316\"\210\301\207" [magit-diff-scope t region magit-diff--make-hunk-overlay eieio-oref start content face magit-diff-lines-heading display magit-diff-hunk-region-header after-string magit-diff--hunk-after-string run-hook-with-args magit-diff-highlight-hunk-region-functions] 11 (#$ . 127236)]) | |
| 591 | #@197 Dim the parts of the hunk that are outside the hunk-internal region. | |
| 592 | This is done by using the same foreground and background color | |
| 593 | for added and removed lines as for context lines. | |
| 594 | ||
| 595 | (fn SECTION) | |
| 596 | (defalias 'magit-diff-highlight-hunk-region-dim-outside #[257 "\203 \302\202 \303 \203 \304\305\304\"D\262\306\307\310\"\311 \312\313\314&\210\306\315 T\307\316\"\312\313\314&\207" [magit-diff-highlight-hunk-body magit-diff-unmarked-lines-keep-foreground magit-diff-context-highlight magit-diff-context :background face-attribute magit-diff--make-hunk-overlay eieio-oref content magit-diff-hunk-region-beginning face priority 2 magit-diff-hunk-region-end end] 9 (#$ . 127735)]) | |
| 597 | #@211 Highlight the hunk-internal region by making it bold. | |
| 598 | Or rather highlight using the face `magit-diff-hunk-region', though | |
| 599 | changing only the `:weight' and/or `:slant' is recommended for that | |
| 600 | face. | |
| 601 | ||
| 602 | (fn SECTION) | |
| 603 | (defalias 'magit-diff-highlight-hunk-region-using-face #[257 "\300\301 \302 T\303\304$\207" [magit-diff--make-hunk-overlay magit-diff-hunk-region-beginning magit-diff-hunk-region-end face magit-diff-hunk-region] 6 (#$ . 128428)]) | |
| 604 | #@154 Emphasize the hunk-internal region using delimiting horizontal lines. | |
| 605 | This is implemented as single-pixel newlines places inside overlays. | |
| 606 | ||
| 607 | (fn SECTION) | |
| 608 | (defalias 'magit-diff-highlight-hunk-region-using-overlays #[257 "\300 \203( \301 \302 \303\211\304\305\306#\303\307\310\311#P\312\313#\314\211T\315$\210\314\211T\316$\207\317!\207" [window-system magit-diff-hunk-region-beginning magit-diff-hunk-region-end propertize " " display (space :height (1)) "\n" line-height t face magit-diff-lines-boundary magit-diff--make-hunk-overlay before-string after-string magit-diff-highlight-hunk-region-using-face] 9 (#$ . 128875)]) | |
| 609 | #@184 Emphasize the hunk-internal region using delimiting horizontal lines. | |
| 610 | This is implemented by overlining and underlining the first and | |
| 611 | last (visual) lines of the region. | |
| 612 | ||
| 613 | (fn SECTION) | |
| 614 | (defalias 'magit-diff-highlight-hunk-region-using-underline #[257 "\300 \203G \301 \302 \212b\210\303 \210`)\212b\210\304 \210`)\305\306\307\310#\311U\2035 \211\312\313&\202D \211\312$\210\211\313$\262\207\314!\207" [window-system magit-diff-hunk-region-beginning magit-diff-hunk-region-end end-of-visual-line beginning-of-visual-line face-background magit-diff-lines-boundary nil t #[642 "\300\301\302\303!&\207" [magit-diff--make-hunk-overlay face after-string magit-diff--hunk-after-string] 11 "\n\n(fn B E &rest FACE)"] :overline :underline magit-diff-highlight-hunk-region-using-face] 14 (#$ . 129510)]) | |
| 615 | #@29 | |
| 616 | ||
| 617 | (fn START END &rest ARGS) | |
| 618 | (defalias 'magit-diff--make-hunk-overlay #[642 "\301\302\303$\304\305\303#\210\203# \304\211A\262\242\211A\262\242#\210\202\f \211B\211\207" [magit-region-overlays make-overlay nil t overlay-put evaporate] 9 (#$ . 130335)]) | |
| 619 | #@13 | |
| 620 | ||
| 621 | (fn FACE) | |
| 622 | (defalias 'magit-diff--hunk-after-string #[257 "\300\301\302\303\304\305\306\307\310 \311 \312 Z^EE\313\314&\207" [propertize " " face display space :align-to + (0 . right) window-hscroll line-end-position line-beginning-position cursor t] 13 (#$ . 130604)]) | |
| 623 | #@55 Return non-nil if point is inside the body of a hunk. | |
| 624 | (defalias 'magit-diff-inside-hunk-body-p #[0 "\300\301!\205 `\302\303 \304\"V\207" [magit-section-match hunk eieio-oref magit-current-section content] 4 (#$ . 130883)]) | |
| 625 | #@16 | |
| 626 | ||
| 627 | (fn SECTION) | |
| 628 | (defalias 'magit-diff-file-header #[257 "\300!\203\f \301\302\"\262\303!\205 \301\304\"\207" [magit-hunk-section-p eieio-oref parent magit-file-section-p header] 4 (#$ . 131113)]) | |
| 629 | #@16 | |
| 630 | ||
| 631 | (fn SECTION) | |
| 632 | (defalias 'magit-diff-hunk-region-header #[257 "\300!\301\302\"\210\211\303\211\225SO\207" [magit-diff-hunk-region-patch string-match "\n" 0] 5 (#$ . 131320)]) | |
| 633 | #@31 | |
| 634 | ||
| 635 | (fn SECTION &optional ARGS) | |
| 636 | (defalias 'magit-diff-hunk-region-patch #[513 "\301\235\203\n \302\202 \303\304\305\"\306 \307 \304\310\"\311\212b\210`W\203f \312\313!\210\314\315\316!\311\317\320#)\266\203\204E `Y\203O `X\203O \315\321!B\262\202` \315\316!\232\203` \322\315\323!PB\262\311y\210\202 )\324\325!r\211q\210\326\321\327\330\331!\332\"\323$\216\333\334\335!\336#c\210\337ed\"\210\340 \262*\210\207" [inhibit-changing-match-data "--reverse" "+" "-" eieio-oref start magit-diff-hunk-region-beginning region-end end nil looking-at "\\(.\\)\\([^\n]*\n\\)" "[@ ]" match-string-no-properties 1 t string-match 0 " " 2 generate-new-buffer " *temp*" make-byte-code "\301\300!\205 \302\300!\207" vconcat vector [buffer-name kill-buffer] mapconcat identity reverse "" diff-fixup-modifs buffer-string] 15 (#$ . 131503)]) | |
| 637 | (provide 'magit-diff) | |
