;ELC
|
;;; Compiled
|
;;; in Emacs version 26.1
|
;;; with all optimizations.
|
|
;;; This file uses dynamic docstrings, first added in Emacs 19.29.
|
|
;;; This file does not contain utf-8 non-ASCII characters,
|
;;; and so can be loaded in Emacs versions earlier than 23.
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
(require 'magit)
|
#@55 Popup console for merge commands.
|
|
(fn &optional ARG)
|
(defalias 'magit-merge-popup #[256 "\300\301\302#\207" [magit-invoke-popup magit-merge-popup nil] 5 (#$ . 425) "P"])
|
(defvar magit-merge-popup (list :variable 'magit-merge-arguments :man-page "git-merge" :switches '((102 "Fast-forward only" "--ff-only") (110 "No fast-forward" "--no-ff")) :options '((115 "Strategy" "--strategy=")) :actions '((109 "Merge" magit-merge-plain) (112 "Preview merge" magit-merge-preview) (101 "Merge and edit message" magit-merge-editmsg) nil (110 "Merge but don't commit" magit-merge-nocommit) (115 "Squash merge" magit-merge-squash) (97 "Absorb" magit-merge-absorb) (105 "Merge into" magit-merge-into)) :sequence-actions '((109 "Commit merge" magit-commit-create) (97 "Abort merge" magit-merge-abort)) :sequence-predicate 'magit-merge-in-progress-p :default-action 'magit-merge :max-action-columns 2))
|
(byte-code "\300\301!\210\302\303\304\305\306DD\307\310\311\312\313&\207" [magit-define-popup-keys-deferred magit-merge-popup custom-declare-variable magit-merge-arguments funcall function #[0 "\301\302\"\207" [magit-merge-popup plist-get :default-arguments] 3] "" :group magit-git-arguments :type (repeat (string :tag "Argument"))] 8)
|
(defalias 'magit-merge-arguments #[0 "\303=\203 \207\n\207" [magit-current-popup magit-current-popup-args magit-merge-arguments magit-merge-popup] 2])
|
(put 'magit-merge-arguments 'definition-name 'magit-merge-popup)
|
#@409 Merge commit REV into the current branch; using default message.
|
|
Unless there are conflicts or a prefix argument is used create a
|
merge commit using a generic commit message and without letting
|
the user inspect the result. With a prefix argument pretend the
|
merge failed to give the user the opportunity to inspect the
|
merge.
|
|
(git merge --no-edit|--no-commit [ARGS] REV)
|
|
(fn REV &optional ARGS NOCOMMIT)
|
(defalias 'magit-merge-plain #[769 "\300 \210\301\302\203 \303\202 \304$\207" [magit-merge-assert magit-run-git-async "merge" "--no-commit" "--no-edit"] 8 (#$ . 1877) (byte-code "\301\302!\303 E\207" [current-prefix-arg magit-read-other-branch-or-commit "Merge" magit-merge-arguments] 3)])
|
#@198 Merge commit REV into the current branch; and edit message.
|
Perform the merge and prepare a commit message but let the user
|
edit it.
|
|
(git merge --edit --no-ff [ARGS] REV)
|
|
(fn REV &optional ARGS)
|
(defalias 'magit-merge-editmsg #[513 "\300 \210\301\235\203 \211\202 \301B\262\302\303\304\305\306C\"$\207" [magit-merge-assert "--no-ff" apply magit-run-git-with-editor "merge" "--edit" append] 9 (#$ . 2589) (byte-code "\300\301!\302 D\207" [magit-read-other-branch-or-commit "Merge" magit-merge-arguments] 2)])
|
#@244 Merge commit REV into the current branch; pretending it failed.
|
Pretend the merge failed to give the user the opportunity to
|
inspect the merge and change the commit message.
|
|
(git merge --no-commit --no-ff [ARGS] REV)
|
|
(fn REV &optional ARGS)
|
(defalias 'magit-merge-nocommit #[513 "\300 \210\301\235\203 \211\202 \301B\262\302\303\304$\207" [magit-merge-assert "--no-ff" magit-run-git-async "merge" "--no-commit"] 7 (#$ . 3114) (byte-code "\300\301!\302 D\207" [magit-read-other-branch-or-commit "Merge" magit-merge-arguments] 2)])
|
#@464 Merge the current branch into BRANCH and remove the former.
|
|
Before merging, force push the source branch to its push-remote,
|
provided the respective remote branch already exists, ensuring
|
that the respective pull-request (if any) won't get stuck on some
|
obsolete version of the commits that are being merged. Finally
|
if `magit-branch-pull-request' was used to create the merged
|
branch, then also remove the respective remote branch.
|
|
(fn BRANCH &optional ARGS)
|
(defalias 'magit-merge-into #[513 "\300 \301\302\"\303U\205 \304\"\207" [magit-get-current-branch magit-call-git "checkout" 0 magit--merge-absort] 6 (#$ . 3660) (byte-code "\300\301\302\303 \"\304\305 \211\205 \306!A\211\205 \307!\205 \211\262\262#\310 D\207" [magit-read-other-local-branch format "Merge `%s' into" magit-get-current-branch nil magit-get-upstream-branch magit-split-branch-name magit-branch-p magit-merge-arguments] 7)])
|
#@464 Merge BRANCH into the current branch and remove the former.
|
|
Before merging, force push the source branch to its push-remote,
|
provided the respective remote branch already exists, ensuring
|
that the respective pull-request (if any) won't get stuck on some
|
obsolete version of the commits that are being merged. Finally
|
if `magit-branch-pull-request' was used to create the merged
|
branch, then also remove the respective remote branch.
|
|
(fn BRANCH &optional ARGS)
|
(defalias 'magit-merge-absorb #[513 "\300\"\207" [magit--merge-absort] 5 (#$ . 4579) (byte-code "\300\301!\302 D\207" [magit-read-other-local-branch "Absorb branch" magit-merge-arguments] 2)])
|
#@20
|
|
(fn BRANCH ARGS)
|
(defalias 'magit--merge-absort #[514 "\301\232\203 \302\303!\204 \304\305!\210\306\307\"\211\2034 \310\311C#\210\312\313\314\315\316\317 \"\320\"\321\322%\"\2028 \323\"\207" [magit-this-process "master" yes-or-no-p "Do you really want to merge `master' into another branch? " user-error "Abort" magit-get-push-branch t magit-git-push "--force-with-lease" set-process-sentinel make-byte-code 514 "\302!\303>\205$ \304!\305U\204 \306\"\207\307\310\311#\210\306\"\210\312\300\301\"\207" vconcat vector [process-status (exit signal) process-exit-status 0 magit-process-sentinel process-put inhibit-refresh t magit--merge-absort-1] 6 "\n\n(fn PROCESS EVENT)" magit--merge-absort-1] 12 (#$ . 5243)])
|
#@20
|
|
(fn BRANCH ARGS)
|
(defalias 'magit--merge-absort-1 #[514 "\301\302\303$\210\304\305\306\307\310\311!\312\"\313\314%\"\207" [magit-this-process magit-run-git-async "merge" "--no-edit" set-process-sentinel make-byte-code 514 "\301!\302>\205- \303!\304V\203 \305\"\207\306\307\310#\210\305\"\210\311\300!\210\312\300!\210\313\314\315\300#\207" vconcat vector [process-status (exit signal) process-exit-status 0 magit-process-sentinel process-put inhibit-refresh t magit-branch-maybe-delete-pr-remote magit-branch-unset-pushRemote magit-run-git "branch" "-D"] 6 "\n\n(fn PROCESS EVENT)"] 10 (#$ . 5982)])
|
#@103 Squash commit REV into the current branch; don't create a commit.
|
|
(git merge --squash REV)
|
|
(fn REV)
|
(defalias 'magit-merge-squash #[257 "\300 \210\301\302\303#\207" [magit-merge-assert magit-run-git-async "merge" "--squash"] 5 (#$ . 6604) (byte-code "\300\301!C\207" [magit-read-other-branch-or-commit "Squash"] 2)])
|
#@66 Preview result of merging REV into the current branch.
|
|
(fn REV)
|
(defalias 'magit-merge-preview #[257 "\300\301\"\207" [magit-mode-setup magit-merge-preview-mode] 4 (#$ . 6930) (byte-code "\300\301!C\207" [magit-read-other-branch-or-commit "Preview merge"] 2)])
|
(defvar magit-merge-preview-mode-hook nil)
|
(byte-code "\300\301N\204\f \302\300\301\303#\210\304\305!\204 \302\305\306\307#\210\300\207" [magit-merge-preview-mode-hook variable-documentation put "Hook run after entering Magit Merge 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-merge-preview-mode-map definition-name magit-merge-preview-mode] 4)
|
(defvar magit-merge-preview-mode-map (make-sparse-keymap))
|
(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-merge-preview-mode-abbrev-table magit-merge-preview-mode-map variable-documentation put purecopy "Keymap for `magit-merge-preview-mode'." boundp magit-merge-preview-mode-syntax-table definition-name magit-merge-preview-mode (lambda (#1=#:def-tmp-var) (defvar magit-merge-preview-mode-syntax-table #1#)) make-syntax-table "Syntax table for `magit-merge-preview-mode'." (lambda (#1#) (defvar magit-merge-preview-mode-abbrev-table #1#)) define-abbrev-table nil "Abbrev table for `magit-merge-preview-mode'." derived-mode-parent magit-diff-mode custom-mode-group magit-diff] 5)
|
#@252 Mode for previewing a merge.
|
|
In addition to any hooks its parent mode `magit-diff-mode' might have run,
|
this mode runs the hook `magit-merge-preview-mode-hook', as the final or penultimate step
|
during initialization.
|
|
\{magit-merge-preview-mode-map}
|
(defalias 'magit-merge-preview-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!\207" [delay-mode-hooks major-mode mode-name magit-merge-preview-mode-map magit-merge-preview-mode-syntax-table magit-merge-preview-mode-abbrev-table make-local-variable t magit-diff-mode magit-merge-preview-mode "Magit Merge" 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 run-mode-hooks magit-merge-preview-mode-hook local-abbrev-table] 5 (#$ . 8581) nil])
|
#@12
|
|
(fn REV)
|
(defalias 'magit-merge-preview-refresh-buffer #[257 "\306 \211\206 \307\310!\311\312\313\206 \310#!\210\314\315!\203 \211\202( \211\236A\206( \316\317\315!\203? \320\"@\206@ \321\322\300#\202@ \323\324\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[\343\344\345\346\347\n# %\210\350\351!\210\352!\210\353\337\354\"\355\"\210\330\356\326 #\357\360\"\361\312\362\337\363\"\"!\361\312\364\337\363\"\"!\203\354 J\206\377 \365!\203\367 J\206\377 \365!\205\377 \211J\212\337\354\"b\210`W\2036\366`\316\"\206\367`\316\"\204/\370`\316\n$\210\203/\370`\360$\210\211b\266\202)\266\211\f=\203I\324 <\371!)\202Z\330\337\372\"\373\337\211\372\"\373\"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-get-current-branch magit-rev-verify "HEAD" magit-set-header-line-format format "Preview merge of %s into %s" diffbuf 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-wash magit-diff-wash-diffs "merge-tree" magit-git-string "merge-base" 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-section-cache-visibility] 16 (#$ . 9693)])
|
#@57 Abort the current merge operation.
|
|
(git merge --abort)
|
(defalias 'magit-merge-abort #[0 "\300\301\302!!\204\f \303\304!\210\305\306!\210\307\310\311\"\207" [file-exists-p magit-git-dir "MERGE_HEAD" user-error "No merge in progress" magit-confirm abort-merge magit-run-git-async "merge" "--abort"] 3 (#$ . 11626) nil])
|
#@80 During a conflict checkout and stage side, or restore conflict.
|
|
(fn FILE ARG)
|
(defalias 'magit-checkout-stage #[514 "\211\300!@AAB\301:\203\334 @\211\302\267\202\323 A\211:\203w \211@\211\303=\203l A\211:\203a \211A\211\204; \304\305\306 #\202\\ \307\232\203L \304\310\307\306\f$\202\\ \311\310 \306\f$\210\304\312\313\306\f$\262\202g \"\262\202r \"\262\202} \"\262\202\327 A\211:\203\310 \211A\211:\203\275 \211@\211\303=\203\262 A\211\204\247 \304\305\306 #\202\255 \"\262\202\270 \"\262\202\303 \"\262\202\316 \"\262\202\327 \"\262\202\340 \211\"\207" [magit-file-status #[514 "\211\300\232\203 \301\302\300\303$\207\304\302\303$\210\301\305\306\303$\207" [#1="--merge" magit-run-git #2="checkout" "--" magit-call-git #3="add" #4="-u"] 7 "\n\n(fn FILE ARG)"] #s(hash-table size 2 test equal rehash-size 1.5 rehash-threshold 0.8125 purecopy t data ("--ours" 22 "--theirs" 130)) 68 magit-run-git "rm" "--" #1# #2# magit-call-git #3# #4#] 14 (#$ . 11951) (byte-code "\300\301\302 \303\211\211\304\305 &\211\306 \235\203 \211\307!D\202- \310\311\312\"!\203* \211\313D\202- \314\315!\207" [magit-completing-read "Checkout file" magit-tracked-files nil magit-read-file-hist magit-current-file magit-unmerged-files magit-checkout-read-stage yes-or-no-p format "Restore conflicts in %s? " "--merge" user-error "Quit"] 8)])
|
(defalias 'magit-merge-in-progress-p #[0 "\300\301\302!!\207" [file-exists-p magit-git-dir "MERGE_HEAD"] 3])
|
#@23
|
|
(fn &optional HEAD)
|
(defalias 'magit--merge-range #[256 "\211\204 \300\301\302\303!!@!\262\211\205 \304\305\306\307$\310Q\207" [magit-get-shortname magit-file-lines magit-git-dir "MERGE_HEAD" magit-git-string "merge-base" "--octopus" "HEAD" ".."] 6 (#$ . 13458)])
|
(defalias 'magit-merge-assert #[0 "\300\301!?\206 \302\303\304\"\207" [magit-anything-modified-p t magit-confirm merge-dirty "Merging with dirty worktree is risky. Continue"] 3])
|
#@13
|
|
(fn FILE)
|
(defalias 'magit-checkout-read-stage #[257 "\300\301\302\"\303P\304\"\211\305\267\202 \306\202 \307\202 \310\202 \311\207" [read-char-choice format "For %s checkout: " "[o]ur stage, [t]heir stage, [c]onflict, or [C-g] to abort " (111 116 99) #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (111 15 116 19 99 23)) "--ours" "--theirs" "--merge" nil] 5 (#$ . 13916)])
|
#@33 Keymap for `unmerged' sections.
|
(defvar magit-unmerged-section-map (byte-code "\300 \301\302\303#\210\211\207" [make-sparse-keymap define-key [remap magit-visit-thing] magit-diff-dwim] 5) (#$ . 14341))
|
#@121 Insert section for the on-going merge.
|
Display the heads that are being merged.
|
If no merge is in progress, do nothing.
|
(defalias 'magit-insert-merge-log #[0 "\306 \205n\307\310\311\312\313!!\"\314@!\315\316!\203 \211\202$ \211\236A\206$ \317\320\316!\203; \321\"@\206< \322\323\300#\202< \324\325\326 \327 &\330\331\332\333\"\211\203V \211\334=\202\210 \n\205a \335\336!\n\"\211\203l \337\331\"\202\206 \340 \"\211\205\204 \341!\203\201 \211!\262\211\334=\262\262\262#\210\211\n\206\232 ?\205\232 \f \3422h\343\344\345\346\347\350#\"!\210\351@\352@\235\204\275 \352B\262\211\262\"\210\353\354!\210\355!\210\356\337\357\"\360\"\210\330\361\326 #\362\363\"\364\344\365\337\366\"\"!\364\344\367\337\366\"\"!\203\371 J\206\f\370!\203J\206\f\370!\205\f\211J\212\337\357\"b\210`W\203C\371`\317\"\206\"\372`\317\"\204<\373`\317\n$\210\203<\373`\363$\210\211b\266\202)\266\211\f=\203V\374 A\375!)\202g\330\337\376\"\377\337\211\376\"\377\"C\244#0\210+\262\266\202\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-merge-in-progress-p mapcar magit-get-shortname magit-file-lines magit-git-dir "MERGE_HEAD" magit--merge-range unmerged 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 format "Merging %s:" mapconcat identity ", " magit-insert-log "--decorate=full" 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 nil magit-section-show parent children magit-log-section-arguments magit-section-cache-visibility] 15 (#$ . 14551)])
|
(provide 'magit-merge)
|
