| 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 "\300\301!\210\300\302!\210\300\303!\210\304\305\306\307\310DD\311\312\313\314\315\316\317& \210\304\320\306\307\321DD\322\312\323\314\315\316\324& \210\304\325\306\307\326DD\327\312\330\314\315\316\331& \210\304\332\306\307\333DD\334\312\335\314\315\316\336& \210\304\337\306\307\340DD\341\312\342\314\315\316\343& \210\304\344\306\307\345DD\346\312\347\314\315\316\350& \207" [require magit magit-collab magit-reset custom-declare-variable magit-branch-read-upstream-first funcall function #[0 "\300\207" [t] 1] "Whether to read upstream before name of new branch when creating a branch.\n\n`nil' Read the branch name first.\n`t' Read the upstream first.\n`fallback' Read the upstream first, but if it turns out that the chosen\n value is not a valid upstream (because it cannot be resolved\n as an existing revision), then treat it as the name of the\n new branch and continue by reading the upstream next." :package-version (magit . "2.2.0") :group magit-commands :type (choice (const :tag "read branch name first" nil) (const :tag "read upstream first" t) (const :tag "read upstream first, with fallback" fallback)) magit-branch-prefer-remote-upstream #[0 "\300\207" [nil] 1] "Whether to favor remote upstreams when creating new branches.\n\nWhen a new branch is created, then the branch, commit, or stash\nat point is suggested as the default starting point of the new\nbranch, or if there is no such revision at point the current\nbranch. In either case the user may choose another starting\npoint.\n\nIf the chosen starting point is a branch, then it may also be set\nas the upstream of the new branch, depending on the value of the\nGit variable `branch.autoSetupMerge'. By default this is done\nfor remote branches, but not for local branches.\n\nYou might prefer to always use some remote branch as upstream.\nIf the chosen starting point is (1) a local branch, (2) whose\nname matches a member of the value of this option, (3) the\nupstream of that local branch is a remote branch with the same\nname, and (4) that remote branch can be fast-forwarded to the\nlocal branch, then the chosen branch is used as starting point,\nbut its own upstream is used as the upstream of the new branch.\n\nMembers of this option's value are treated as branch names that\nhave to match exactly unless they contain a character that makes\nthem invalid as a branch name. Recommended characters to use\nto trigger interpretation as a regexp are \"*\" and \"^\". Some\nother characters which you might expect to be invalid, actually\nare not, e.g. \".+$\" are all perfectly valid. More precisely,\nif `git check-ref-format --branch STRING' exits with a non-zero\nstatus, then treat STRING as a regexp.\n\nAssuming the chosen branch matches these conditions you would end\nup with with e.g.:\n\n feature --upstream--> origin/master\n\ninstead of\n\n feature --upstream--> master --upstream--> origin/master\n\nWhich you prefer is a matter of personal preference. If you do\nprefer the former, then you should add branches such as \"master\",\n\"next\", and \"maint\" to the value of this options." (magit . "2.4.0") (repeat string) magit-branch-adjust-remote-upstream-alist #[0 "\300\207" [nil] 1] "Alist of upstreams to be used when branching from remote branches.\n\nWhen creating a local branch from an ephemeral branch located\non a remote, e.g. a feature or hotfix branch, then that remote\nbranch should usually not be used as the upstream branch, since\nthe push-remote already allows accessing it and having both the\nupstream and the push-remote reference the same related branch\nwould be wasteful. Instead a branch like \"maint\" or \"master\"\nshould be used as the upstream.\n\nThis option allows specifing the branch that should be used as\nthe upstream when branching certain remote branches. The value\nis an alist of the form ((UPSTREAM . RULE)...). The first\nmatching element is used, the following elements are ignored.\n\nUPSTREAM is the branch to be used as the upstream for branches\nspecified by RULE. It can be a local or a remote branch.\n\nRULE can either be a regular expression, matching branches whose\nupstream should be the one specified by UPSTREAM. Or it can be\na list of the only branches that should *not* use UPSTREAM; all\nother branches will. Matching is done after stripping the remote\npart of the name of the branch that is being branched from.\n\nIf you use a finite set of non-ephemeral branches across all your\nrepositories, then you might use something like:\n\n ((\"origin/master\" \"master\" \"next\" \"maint\"))\n\nOr if the names of all your ephemeral branches contain a slash,\nat least in some repositories, then a good value could be:\n\n ((\"origin/master\" . \"/\"))\n\nOf course you can also fine-tune:\n\n ((\"origin/maint\" . \"\\\\\\=`hotfix/\")\n (\"origin/master\" . \"\\\\\\=`feature/\"))\n\nIf you use remote branches as UPSTREAM, then you might also want\nto set `magit-branch-prefer-remote-upstream' to a non-nil value.\nHowever, I recommend that you use local branches as UPSTREAM." (magit . "2.9.0") (repeat (cons (string :tag "Use upstream") (choice :tag "for branches" (regexp :tag "matching") (repeat :tag "except" (string :tag "branch"))))) magit-branch-rename-push-target #[0 "\300\207" [t] 1] "Whether the push-remote setup is preserved when renaming a branch.\n\nThe command `magit-branch-rename' renames a branch named OLD to\nNEW. This option controls how much of the push-remote setup is\npreserved when doing so.\n\nWhen nil, then preserve nothing and unset `branch.OLD.pushRemote'.\n\nWhen `local-only', then first set `branch.NEW.pushRemote' to the\n same value as `branch.OLD.pushRemote', provided the latter is\n actually set and unless the former already has another value.\n\nWhen t, then rename the branch named OLD on the remote specified\n by `branch.OLD.pushRemote' to NEW, provided OLD exists on that\n remote and unless NEW already exists on the remote.\n\nWhen `forge-only' and the `forge' package is available, then\n behave like `t' if the remote points to a repository on a forge\n (currently Github or Gitlab), otherwise like `local-only'.\n\nAnother supported but obsolete value is `github-only'. It is a\n misnomer because it now treated as an alias for `forge-only'." (magit . "2.90.0") (choice (const :tag "Don't preserve push-remote setup" nil) (const :tag "Preserve push-remote setup" local-only) (const :tag "... and rename corresponding branch on remote" t) (const :tag "... but only if remote is on a forge" forge-only)) magit-branch-popup-show-variables #[0 "\300\207" [t] 1] "Whether the `magit-branch-popup' shows Git variables.\nThis defaults to t to avoid changing key bindings. When set to\nnil, no variables are displayed directly in this popup, instead\nthe sub-popup `magit-branch-config-popup' has to be used to view\nand change branch related variables." (magit . "2.7.0") boolean magit-published-branches #[0 "\300\207" [("origin/master")] 1] "List of branches that are considered to be published." (magit . "2.13.0") (repeat string)] 10) | |
| 16 | #@56 Popup console for branch commands. | |
| 17 | ||
| 18 | (fn &optional ARG) | |
| 19 | (defalias 'magit-branch-popup #[256 "\300\301\302#\207" [magit-invoke-popup magit-branch-popup nil] 5 (#$ . 7538) "P"]) | |
| 20 | (defvar magit-branch-popup (byte-code "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\310\325#?\205 \326BBBBBBBBBBBB\327\330\331\332\333\334\257\207" [:variable magit-branch-arguments :man-page "git-branch" :variables #[0 "\205 \207" [magit-branch-popup-show-variables magit-branch-config-variables] 1] :actions (98 "Checkout" magit-checkout) nil (67 "Configure..." magit-branch-config-popup) (108 "Checkout local branch" magit-branch-checkout) (115 "Create new spin-off" magit-branch-spinoff) (109 "Rename" magit-branch-rename) (99 "Checkout new branch" magit-branch-and-checkout) (110 "Create new branch" magit-branch-create) (120 "Reset" magit-branch-reset) (119 "Checkout new worktree" magit-worktree-checkout) (87 "Create new worktree" magit-worktree-branch) (107 "Delete" magit-branch-delete) require forge t ((121 "Checkout pull-request" magit-checkout-pull-request) (89 "Create from pull-request" magit-branch-pull-request)) :default-action magit-checkout :max-action-columns 3 :setup-function magit-branch-popup-setup] 23)) | |
| 21 | (byte-code "\300\301!\210\302\303\304\305\306DD\307\310\311\312\313&\207" [magit-define-popup-keys-deferred magit-branch-popup custom-declare-variable magit-branch-arguments funcall function #[0 "\301\302\"\207" [magit-branch-popup plist-get :default-arguments] 3] "" :group magit-git-arguments :type (repeat (string :tag "Argument"))] 8) | |
| 22 | (defalias 'magit-branch-arguments #[0 "\303=\203 \207\n\207" [magit-current-popup magit-current-popup-args magit-branch-arguments magit-branch-popup] 2]) | |
| 23 | (put 'magit-branch-arguments 'definition-name 'magit-branch-popup) | |
| 24 | #@16 | |
| 25 | ||
| 26 | (fn VAL DEF) | |
| 27 | (defalias 'magit-branch-popup-setup #[514 "\302\"\210\303\304!!\210\305\306\307\310!\"\211\2056 \211@\311\312\313! >\204( \314\315\316D\"\210\317H!\320\"\210A\266\202\202 \207" [magit-popup-mode-map cl-struct-magit-popup-event-tags magit-popup-default-setup use-local-map copy-keymap -filter magit-popup-event-p magit-popup-get :variables local-set-key vector type-of signal wrong-type-argument magit-popup-event 1 magit-invoke-popup-action] 10 (#$ . 9361)]) | |
| 28 | #@299 Checkout REVISION, updating the index and the working tree. | |
| 29 | If REVISION is a local branch, then that becomes the current | |
| 30 | branch. If it is something else, then `HEAD' becomes detached. | |
| 31 | Checkout fails if the working tree or the staging area contain | |
| 32 | changes. | |
| 33 | ||
| 34 | (git checkout REVISION). | |
| 35 | ||
| 36 | (fn REVISION) | |
| 37 | (defalias 'magit-checkout #[257 "\300\301\"\203 \302\303\"\262\304\305\"\207" [string-match "\\`heads/\\(.+\\)" match-string 1 magit-run-git "checkout"] 4 (#$ . 9850) (byte-code "\300\301!C\207" [magit-read-other-branch-or-commit "Checkout"] 2)]) | |
| 38 | #@131 Create BRANCH at branch or revision START-POINT. | |
| 39 | ||
| 40 | (git branch [ARGS] BRANCH START-POINT). | |
| 41 | ||
| 42 | (fn BRANCH START-POINT &optional ARGS) | |
| 43 | (defalias 'magit-branch-create #[770 "\300\301$\210\302\"\210\303 \207" [magit-call-git "branch" magit-branch-maybe-adjust-upstream magit-refresh] 8 (#$ . 10407) (magit-branch-read-args "Create branch")]) | |
| 44 | #@149 Create and checkout BRANCH at branch or revision START-POINT. | |
| 45 | ||
| 46 | (git checkout [ARGS] -b BRANCH START-POINT). | |
| 47 | ||
| 48 | (fn BRANCH START-POINT &optional ARGS) | |
| 49 | (defalias 'magit-branch-and-checkout #[770 "\301\302\303\304#)\266\203\203 \305\306\307$\207\310\311\312%\210\313\"\210\314 \207" [inhibit-changing-match-data "^stash@{[0-9]+}$" nil t string-match magit-run-git "stash" "branch" magit-call-git "checkout" "-b" magit-branch-maybe-adjust-upstream magit-refresh] 10 (#$ . 10754) (magit-branch-read-args "Create and checkout branch")]) | |
| 50 | #@465 Hybrid between `magit-checkout' and `magit-branch-and-checkout'. | |
| 51 | ||
| 52 | Ask the user for an existing branch or revision. If the user | |
| 53 | input actually can be resolved as a branch or revision, then | |
| 54 | check that out, just like `magit-checkout' would. | |
| 55 | ||
| 56 | Otherwise create and checkout a new branch using the input as | |
| 57 | its name. Before doing so read the starting-point for the new | |
| 58 | branch. This is similar to what `magit-branch-and-checkout' | |
| 59 | does. | |
| 60 | ||
| 61 | (fn ARG &optional START-POINT) | |
| 62 | (defalias 'magit-branch-or-checkout #[513 "\300\301\"\203 \302\303\"\262\211\203 \304\305 #\207\306!\207" [string-match "\\`heads/\\(.+\\)" match-string 1 magit-branch-and-checkout magit-branch-arguments magit-checkout] 6 (#$ . 11305) (byte-code "\300\301!\211\302!?\205 \303\304\"D\207" [magit-read-other-branch-or-commit "Checkout" magit-rev-verify-commit magit-read-starting-point "Create and checkout branch"] 5)]) | |
| 63 | #@937 Checkout an existing or new local branch. | |
| 64 | ||
| 65 | Read a branch name from the user offering all local branches and | |
| 66 | a subset of remote branches as candidates. Omit remote branches | |
| 67 | for which a local branch by the same name exists from the list | |
| 68 | of candidates. The user can also enter a completely new branch | |
| 69 | name. | |
| 70 | ||
| 71 | - If the user selects an existing local branch, then check that | |
| 72 | out. | |
| 73 | ||
| 74 | - If the user selects a remote branch, then create and checkout | |
| 75 | a new local branch with the same name. Configure the selected | |
| 76 | remote branch as push target. | |
| 77 | ||
| 78 | - If the user enters a new branch name, then create and check | |
| 79 | that out, after also reading the starting-point from the user. | |
| 80 | ||
| 81 | In the latter two cases the upstream is also set. Whether it is | |
| 82 | set to the chosen START-POINT or something else depends on the | |
| 83 | value of `magit-branch-adjust-remote-upstream-alist', just like | |
| 84 | when using `magit-branch-and-checkout'. | |
| 85 | ||
| 86 | (fn BRANCH &optional START-POINT) | |
| 87 | (defalias 'magit-branch-checkout #[513 "\211\204 \300!\207\301 \203 \302\303!\210\304\305 #\210\306!\205B \307!\211@A\211\232\205> \211\310\311!\232?\205> \312\313 \314$\266\202\266\203\207" [magit-checkout magit-anything-modified-p user-error "Cannot checkout when there are uncommitted changes" magit-branch-and-checkout magit-branch-arguments magit-remote-branch-p magit-split-branch-name magit-get "remote.pushDefault" magit-set "branch" "pushRemote"] 12 (#$ . 12206) (byte-code "\300 \301 \302\303 \304\2033 @\305\306\"\203' \211\304\225\302O\307B\235\204' \211B\262\210\211T\262A\262\202 \266\211\237\262\310\"\244\311 \312\313\302\211\211\314 \235@\206h \205h \305\306 \"\205d \304\225\302O \235@&\211\235\203\201 \305\306\"\205| \211\304\225\302OD\202\222 \211\235\203\214 \211C\202\222 \211\315\316\"D\207" [magit-get-current-branch magit-list-local-branch-names nil magit-list-remote-branch-names 0 string-match "[^/]+/" "HEAD" delete magit-branch-at-point magit-completing-read "Checkout branch" magit-revision-history magit-read-starting-point "Create"] 15)]) | |
| 88 | #@27 | |
| 89 | ||
| 90 | (fn BRANCH START-POINT) | |
| 91 | (defalias 'magit-branch-maybe-adjust-upstream #[514 "\302!\203\f \303!\206e \304!\205e \305!A\306\307\310\203] \203] @\203. \306\262\202Q \211A<\203< A\235?\202K \211A\306\307\311#)\266\203\203Q \211\262\210\211T\262A\262\202 \266\211\262@\262\211\205p \312\313\314P#\207" [magit-branch-adjust-remote-upstream-alist inhibit-changing-match-data magit-get-upstream-branch magit-get-indirect-upstream-branch magit-remote-branch-p magit-split-branch-name nil t 0 string-match magit-call-git "branch" "--set-upstream-to="] 15 (#$ . 14266)]) | |
| 92 | #@171 Create and checkout an orphan BRANCH with contents from revision START-POINT. | |
| 93 | ||
| 94 | (git checkout --orphan [ARGS] BRANCH START-POINT). | |
| 95 | ||
| 96 | (fn BRANCH START-POINT &optional ARGS) | |
| 97 | (defalias 'magit-branch-orphan #[770 "\300\301\302%\207" [magit-run-git "checkout" "--orphan"] 9 (#$ . 14863) (magit-branch-read-args "Create and checkout orphan branch")]) | |
| 98 | #@109 Create and configure a new branch from a pull-request. | |
| 99 | Please see the manual for more information. | |
| 100 | ||
| 101 | (fn PR) | |
| 102 | (defalias 'magit-branch-pull-request #[257 "\211\302\303\304\236A\236A\236A\305\306\303\307\236A\236A\236A\236A\310\307\236A\236A\302\303\307\236A\236A\236A\311\303\307\236A\236A\236A\312\303\307\236A\236A\236A\313\236A\310\304 \236A\236A\314 \236A\315\n\236A\316\317 \320\321\203\213 \203\213 @\203p \316\262\202 \322\323\324\325#\"\203 \211\262\210\211T\262A\262\202\\ \266\211\262\206\230 \326\327 \"\323\324\325#\n\330\320\" \331!\203\331 \332Q\333!\204\275 \334\335\"\210\320\336\"\210)\337\340\341$\210\337\340\342$\266\202\204\343!\203\323\324\325#\344\324\335#\322\"\204\370 \326\345#\210\346\347\"\235\204\334\324\350\351%\210\334\335\"\210\266\202X\334\324\352\353\354\355 \356\357 \"\2041\356\360 \"\2036\202U\356\361 \"\203C\202U\356\362 \"\203P\202U\363\364 \"&\210\334\340\332Q#\210\204l\232\204v\337\340\341$\210\202}\337\340\341$\210\337\340\342$\210\337\365\340\366$\210\334\340\367 \203\234\332 Q\202\236 P#\210\337\370!\340\371$\210\337\340\372$\210\373 \210\266\205\266\212\207" [inhibit-magit-refresh magit-branch-prefer-remote-upstream ssh_url repo base login owner head ref clone_url git_url locked number title nil magit-list-remotes t 0 magit--github-url-equal magit-get "remote" "url" user-error "Upstream repository %s not available as a remote" magit--pullreq-branch magit--pullreq-from-upstream-p "/" magit-branch-p magit-call-git "fetch" magit-branch-create magit-set "branch" "pushRemote" "pullRequestRemote" magit-remote-p magit-get-all "Remote `%s' already exists but does not point to %s" format "+refs/heads/*:refs/remotes/%s/*" "set-branches" "--add" "add" "-f" "--no-tags" "-t" string-prefix-p "git@" "ssh://git@" "https://" "git://" error "%s has an unexpected format" "true" "rebase" "--set-upstream-to=" number-to-string "pullRequest" "description" magit-refresh] 28 (#$ . 15218) (byte-code "\300\301!C\207" [magit-read-pull-request "Branch pull request"] 2)]) | |
| 103 | #@119 Create, configure and checkout a new branch from a pull-request. | |
| 104 | Please see the manual for more information. | |
| 105 | ||
| 106 | (fn PR) | |
| 107 | (defalias 'magit-checkout-pull-request #[257 "\301\302\303!)!\207" [inhibit-magit-refresh magit-checkout t magit-branch-pull-request] 4 (#$ . 17365) (byte-code "\300\301!C\207" [magit-read-pull-request "Checkout pull request"] 2)]) | |
| 108 | #@15 | |
| 109 | ||
| 110 | (fn PROMPT) | |
| 111 | (defalias 'magit-branch-read-args #[257 "\302 \203X \303!\304!\203? \305 \203 \306\307#\202 \310\311\312\313\314\"A\314#\315 \235\2056 \211\316 \235?\2056 \211\262\"E\202S \317=\203O \211\303\"E\202S \320\321\"\262\202f \305\322P!\211\303\"E\262\207" [magit-branch-read-upstream-first magit-completing-read--silent-default magit-branch-arguments magit-read-starting-point magit-rev-verify magit-read-string-ns format "%s (starting at `%s')" "Name for new branch" mapconcat identity split-string "/" magit-list-remote-branch-names magit-list-local-branch-names fallback user-error "Not a valid starting-point: %s" " named"] 10 (#$ . 17723)]) | |
| 112 | #@1386 Create new branch from the unpushed commits. | |
| 113 | ||
| 114 | Create and checkout a new branch starting at and tracking the | |
| 115 | current branch. That branch in turn is reset to the last commit | |
| 116 | it shares with its upstream. If the current branch has no | |
| 117 | upstream or no unpushed commits, then the new branch is created | |
| 118 | anyway and the previously current branch is not touched. | |
| 119 | ||
| 120 | This is useful to create a feature branch after work has already | |
| 121 | began on the old branch (likely but not necessarily "master"). | |
| 122 | ||
| 123 | If the current branch is a member of the value of option | |
| 124 | `magit-branch-prefer-remote-upstream' (which see), then the | |
| 125 | current branch will be used as the starting point as usual, but | |
| 126 | the upstream of the starting-point may be used as the upstream | |
| 127 | of the new branch, instead of the starting-point itself. | |
| 128 | ||
| 129 | If optional FROM is non-nil, then the source branch is reset | |
| 130 | to `FROM~', instead of to the last commit it shares with its | |
| 131 | upstream. Interactively, FROM is only ever non-nil, if the | |
| 132 | region selects some commits, and among those commits, FROM is | |
| 133 | the commit that is the fewest commits ahead of the source | |
| 134 | branch. | |
| 135 | ||
| 136 | The commit at the other end of the selection actually does not | |
| 137 | matter, all commits between FROM and `HEAD' are moved to the new | |
| 138 | branch. If FROM is not reachable from `HEAD' or is reachable | |
| 139 | from the source branch's upstream, then an error is raised. | |
| 140 | ||
| 141 | (fn BRANCH &optional FROM &rest ARGS) | |
| 142 | (defalias 'magit-branch-spinoff #[641 "\301!\203 \302\303\"\210\304 \211\203\220 \305!\306\203> \307\"\204* \302\310$\210\203> \307\"\203> \302\311$\210\312\313\314\315 %\210)\316!\211\203Z \313\317\320\n$\210\210\203\211 \203i \321P\202n \322\323#\211\262\203\211 \324\"\204\211 \313\325\326\327\330\"\331P%\210\332 \266\202\202\226 \333\314\315#\207" [magit-process-raise-error magit-branch-p user-error "Cannot spin off %s. It already exists" magit-get-current-branch magit-get-upstream-branch nil magit-rev-ancestor-p "Cannot spin off %s. %s is not reachable from %s" "Cannot spin off %s. %s is ancestor of upstream %s" t magit-call-git "checkout" "-b" magit-get-indirect-upstream-branch "branch" "--set-upstream-to" "^" magit-git-string "merge-base" magit-rev-eq "update-ref" "-m" format "reset: moving to %s" "refs/heads/" magit-refresh magit-run-git] 12 (#$ . 18409) (byte-code "\300\301!\302\303\304!!@\305 E\207" [magit-read-string-ns "Spin off branch" last magit-region-values commit magit-branch-arguments] 4)]) | |
| 143 | #@560 Reset a branch to the tip of another branch or any other commit. | |
| 144 | ||
| 145 | When the branch being reset is the current branch, then do a | |
| 146 | hard reset. If there are any uncommitted changes, then the user | |
| 147 | has to confirm the reset because those changes would be lost. | |
| 148 | ||
| 149 | This is useful when you have started work on a feature branch but | |
| 150 | realize it's all crap and want to start over. | |
| 151 | ||
| 152 | When resetting to another branch and a prefix argument is used, | |
| 153 | then also set the target branch as the upstream of the branch | |
| 154 | that is being reset. | |
| 155 | ||
| 156 | (fn BRANCH TO &optional ARGS SET-UPSTREAM) | |
| 157 | (defalias 'magit-branch-reset #[1026 "\300\235\204 \300B\262\301 \232\2034 \302 \203! \303\304!\204! \305\306!\207\307!\210\211\2053 \310!\2053 \311\"\207\312#\207" ["--force" magit-get-current-branch magit-anything-modified-p yes-or-no-p "Uncommitted changes will be lost. Proceed? " user-error "Abort" magit-reset-hard magit-branch-p magit-set-upstream-branch magit-branch-create] 8 (#$ . 20870) (byte-code "\301 \302\303\"\211\304\305\306\"\307\310 \"\311\211\211\312\n\232\204\" \206& \313 !&\314 F\207" [current-prefix-arg magit-local-branch-at-point magit-read-local-branch "Reset branch" magit-completing-read format "Reset %s to" delete magit-list-branch-names nil magit-revision-history magit-get-upstream-branch magit-branch-arguments] 12)]) | |
| 158 | #@219 Delete one or multiple branches. | |
| 159 | If the region marks multiple branches, then offer to delete | |
| 160 | those, otherwise prompt for a single branch to be deleted, | |
| 161 | defaulting to the branch at point. | |
| 162 | ||
| 163 | (fn BRANCHES &optional FORCE) | |
| 164 | (defalias 'magit-branch-delete #[513 "\301\302\"\303\304\203\" @\211\204 \211B\262\210\211T\262A\262\202 \266\211\237\262\211\203W \305\306G\211\307U\203A \310\311\312\313\n\"\"\202S \211GU\203O \310\314\"\202S \310\315\"\262\"\210\316\317@\"\203\212 \320\307@\"\211GT\321\322\301\323\324\325\326\327 !\330\"\331\332%\n\"#\210\333\334\335\"\"\266\202\202uG\307V\203\263 \336\337 \"\262\340\341\"\210\340\342\"\210\343\344\203\254 \345\202\255 \346#\202u@\310\347\"\337 \232\203]\350\232\204\314 \351\350!\204\346 \352\353P\354\"\211\355\267\202\340 \356\202\341 \357\202\341 \303\262\202\352\360P\361\"\211\362\267\202\376 \356\202\377 \363\202\377 \357\202\377 \303\262\211\364\267\202Y\365\232\204%\235\204%\366\367\"\204%\370\371\372\373\303C%\210\374\375\376\"\210\202Y\377\232\204K\235\204K\366\350\"\204K\370\371\372\373\303C%\210\374\375\350\"\210\202Y\305\201@ !\210\210\367\262\341!\210\342!\210\343\344\203p\345\202q\346#\266\202\207" [magit-this-process mapcar magit-ref-fullname nil 0 user-error "%s ambiguous. Please cleanup using git directly." 1 format "%s is" -first magit-ref-ambiguous-p "These %s names are" "%s of these names are" string-match "^refs/remotes/\\([^/]+\\)" match-string magit-run-git-async "push" make-byte-code 257 "\301\300\302OP\207" vconcat vector [":" nil] 5 "\n\n(fn IT)" set-process-sentinel apply-partially magit-delete-remote-branch-sentinel delete magit-get-current-branch mapc magit-branch-maybe-delete-pr-remote magit-branch-unset-pushRemote magit-run-git "branch" "-D" "-d" "Branch %s is checked out. " "master" magit-rev-verify read-char-choice "[d]etach HEAD & delete, [a]bort " (100 97) #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (100 216 97 220)) detach abort "[d]etach HEAD & delete, [c]heckout master & delete, [a]bort " (100 99 97) #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (100 242 99 246 97 250)) master #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (detach 263 master 301 abort 339)) (4) magit-branch-merged-p t magit-confirm delete-unmerged-branch "Delete unmerged branch %s" "" magit-call-git "checkout" "--detach" (4) "Abort"] 16 (#$ . 22212) (byte-code "\301\302\303\"G\304V\203 \305\303\306\307\306%\210\202& \310\203! \311\202\" \312!C\262\211\204Q \313\314\"\211\203P \305\315\316\317\320%\203B \262\202P \321\"\211\262\204P \322\323!\210\210D\207" [current-prefix-arg magit-region-values branch t 1 magit-confirm nil "Delete %i branches" magit-read-branch-prefer-other "Force delete branch" "Delete branch" -remove magit-branch-merged-p delete-unmerged-branch "Delete unmerged branch %s" "Delete %i unmerged branches" noabort -difference user-error "Abort"] 9)]) | |
| 165 | (put 'magit-branch-delete 'interactive-only t) | |
| 166 | #@15 | |
| 167 | ||
| 168 | (fn BRANCH) | |
| 169 | (defalias 'magit-branch-maybe-delete-pr-remote #[257 "\300\301\302#\211\205 \303\304\"\305!\303\306\"\235?\205} \300\301\307#\232\203. \303\310$\202Q \300\301\311#\211\205O \312\313\"\205O \211\314\315O\211\262\205O \303\310$\262\211\235\205{ G\316U\203s \317\320\303\321\322#\"\203s \323\324\325#\202{ \323\326\327\330!$\262\266\202\207" [magit-get "branch" "pullRequestRemote" format "remote.%s.fetch" magit-get-all "+refs/heads/*:refs/remotes/%s/*" "pushRemote" "+refs/heads/%s:refs/remotes/%s/%s" "merge" string-prefix-p "refs/heads/" 11 nil 1 magit-confirm delete-pr-remote "Also delete remote %s (%s)" "no pull-request branch remains" magit-call-git "remote" "rm" "config" "--unset" regexp-quote] 11 (#$ . 25333)]) | |
| 170 | #@15 | |
| 171 | ||
| 172 | (fn BRANCH) | |
| 173 | (defalias 'magit-branch-unset-pushRemote #[257 "\300\301\302\303$\207" [magit-set nil "branch" "pushRemote"] 6 (#$ . 26103)]) | |
| 174 | #@27 | |
| 175 | ||
| 176 | (fn REFS PROCESS EVENT) | |
| 177 | (defalias 'magit-delete-remote-branch-sentinel #[771 "\301!\302>\205S \303!\304U\203 \305\"\207\306\307\"\211\203M \310\311\312#\210\305\"\210\313\314\315\316\"\210\211\211\203C \211@\317\320\321#\210A\266\202\2020 \210\322 \210\314\323!\202Q \305\"\262\207" [magit-this-error process-status (exit signal) process-exit-status 0 magit-process-sentinel -filter magit-ref-exists-p process-put inhibit-refresh t nil message "Some remote branches no longer exist. %s" "Deleting just the local tracking refs instead..." magit-call-git "update-ref" "-d" magit-refresh "Deleting local remote-tracking refs...done"] 10 (#$ . 26250)]) | |
| 178 | #@354 Rename the branch named OLD to NEW. | |
| 179 | ||
| 180 | With a prefix argument FORCE, rename even if a branch named NEW | |
| 181 | already exists. | |
| 182 | ||
| 183 | If `branch.OLD.pushRemote' is set, then unset it. Depending on | |
| 184 | the value of `magit-branch-rename-push-target' (which see) maybe | |
| 185 | set `branch.NEW.pushRemote' and maybe rename the push-target on | |
| 186 | the remote. | |
| 187 | ||
| 188 | (fn OLD NEW &optional FORCE) | |
| 189 | (defalias 'magit-branch-rename #[770 "\301\302\"\203 \303\304\"\262\232\203 \305\306!\210\307\310\203! \311\202\" \312$\210\203\254 \313!\314\310\315#\314\310\315#\203K \204C \211\204K \316\310\315$\210\313!\232\203\252 \317=\204\252 \320>\203s \321\322\323\324#\203\252 \325\326!\203\252 \326!\203\252 \327\324\"\327\324\"\313!\203\250 \204\250 \330\331\332 $!\203\250 \307\333\334\331\335#\331\336\"%\210\266\266\337!\210\340 \207" [magit-branch-rename-push-target string-match "\\`heads/\\(.+\\)" match-string 1 user-error "Old and new branch names are the same" magit-call-git "branch" "-M" "-m" magit-get-push-remote magit-get "pushRemote" magit-set local-only (forge-only github-only) require forge nil t fboundp forge--forge-remote-p magit-get-push-branch magit-y-or-n-p format "Also rename %S to %S on %S" "push" "-v" "%s:refs/heads/%s" ":refs/heads/%s" magit-branch-unset-pushRemote magit-refresh] 17 (#$ . 26924) (byte-code "\301\302!\211\303\304\305\"\306\307#E\207" [current-prefix-arg magit-read-local-branch "Rename branch" magit-read-string-ns format "Rename branch '%s' to" nil magit-revision-history] 6)]) | |
| 190 | #@128 Shelve a BRANCH. | |
| 191 | Rename "refs/heads/BRANCH" to "refs/shelved/BRANCH", | |
| 192 | and also rename the respective reflog file. | |
| 193 | ||
| 194 | (fn BRANCH) | |
| 195 | (defalias 'magit-branch-shelve #[257 "\300P\301P\302\303\304$\210\305\"\210\306!\210\307\310\311#\207" ["refs/heads/" "refs/shelved/" magit-git "update-ref" "" magit--rename-reflog-file magit-branch-unset-pushRemote magit-run-git "branch" "-D"] 8 (#$ . 28455) (byte-code "\300\301!C\207" [magit-read-other-local-branch "Shelve branch"] 2)]) | |
| 196 | #@129 Unshelve a BRANCH | |
| 197 | Rename "refs/shelved/BRANCH" to "refs/heads/BRANCH", | |
| 198 | and also rename the respective reflog file. | |
| 199 | ||
| 200 | (fn BRANCH) | |
| 201 | (defalias 'magit-branch-unshelve #[257 "\300P\301P\302\303\304$\210\305\"\210\306\303\307#\207" ["refs/shelved/" "refs/heads/" magit-git "update-ref" "" magit--rename-reflog-file magit-run-git "-d"] 8 (#$ . 28938) (byte-code "\300\301\302\303\304\305!\"\306\307$C\207" [magit-completing-read "Unshelve branch" mapcar #[257 "\211\300\301O\207" [8 nil] 4 "\n\n(fn IT)"] magit-list-refnames "refs/shelved" nil t] 6)]) | |
| 202 | #@16 | |
| 203 | ||
| 204 | (fn OLD NEW) | |
| 205 | (defalias 'magit--rename-reflog-file #[514 "\300\301P!\300\301P!\302!\205 \303\304!\305\"\210\306\305#\207" [magit-git-dir "logs/" file-exists-p make-directory file-name-directory t rename-file] 8 (#$ . 29494)]) | |
| 206 | (defvar magit-branch-config-branch nil) | |
| 207 | #@58 Popup console for setting branch variables. | |
| 208 | ||
| 209 | (fn BRANCH) | |
| 210 | (defalias 'magit-branch-config-popup #[257 "\211\301\302\303\211#)\207" [magit-branch-config-branch magit-invoke-popup magit-branch-config-popup nil] 5 (#$ . 29774) (byte-code "\204 \303=\203 \n\203 \304\305!\202 \306 C\207" [current-prefix-arg magit-current-popup magit-branch-popup-show-variables magit-branch-popup magit-read-local-branch "Configure branch" magit-get-current-branch] 2)]) | |
| 211 | (defvar magit-branch-config-variables '((lambda nil (concat (propertize "Configure " 'face 'magit-popup-heading) (propertize (magit-branch-config-branch) 'face 'magit-branch-local))) (100 "branch.%s.description" magit-edit-branch*description magit-format-branch*description) (117 "branch.%s.merge" magit-set-branch*merge/remote magit-format-branch*merge/remote) (114 "branch.%s.rebase" magit-cycle-branch*rebase magit-format-branch*rebase) (112 "branch.%s.pushRemote" magit-cycle-branch*pushRemote magit-format-branch*pushRemote) "Configure repository defaults" (134217842 "pull.rebase" magit-cycle-pull\.rebase magit-format-pull\.rebase) (134217840 "remote.pushDefault" magit-cycle-remote\.pushDefault magit-format-remote\.pushDefault) "Configure branch creation" (85 "branch.autoSetupMerge" magit-cycle-branch*autoSetupMerge magit-format-branch*autoSetupMerge) (82 "branch.autoSetupRebase" magit-cycle-branch*autoSetupRebase magit-format-branch*autoSetupRebase))) | |
| 212 | (defvar magit-branch-config-popup (byte-code "\301\302\303\304BBBB\207" [magit-branch-config-variables :man-page "git-branch" :variables (:setup-function magit-branch-config-popup-setup)] 5)) | |
| 213 | #@16 | |
| 214 | ||
| 215 | (fn VAL DEF) | |
| 216 | (defalias 'magit-branch-config-popup-setup #[514 "\303\"\210\304\300!\210\305\306 !!\210\307\310\311\312!\"\211\205< \211@\313\314\315!\n>\204. \316\317\320D\"\210\321H!\322\"\210A\266\202\202 \207" [magit-branch-config-branch magit-popup-mode-map cl-struct-magit-popup-event-tags magit-popup-default-setup make-local-variable use-local-map copy-keymap -filter magit-popup-event-p magit-popup-get :variables local-set-key vector type-of signal wrong-type-argument magit-popup-event 1 magit-invoke-popup-action] 10 (#$ . 31395)]) | |
| 217 | #@25 | |
| 218 | ||
| 219 | (fn &optional PROMPT) | |
| 220 | (defalias 'magit-branch-config-branch #[256 "\211\203 \204 \206 \302 \206 \303!\207 \206 \302 \206 \304\207" [current-prefix-arg magit-branch-config-branch magit-get-current-branch magit-read-local-branch "<name>"] 3 (#$ . 31954)]) | |
| 221 | #@223 Edit the description of the current branch. | |
| 222 | With a prefix argument edit the description of another branch. | |
| 223 | ||
| 224 | The description for the branch named NAME is stored in the Git | |
| 225 | variable `branch.<name>.description'. | |
| 226 | ||
| 227 | (fn BRANCH) | |
| 228 | (defalias 'magit-edit-branch*description #[257 "\300\301\302#\207" [magit-run-git-with-editor "branch" "--edit-description"] 5 (#$ . 32226) (byte-code "\300\301!C\207" [magit-branch-config-branch "Edit branch description"] 2)]) | |
| 229 | (defalias 'magit-edit-branch*description-check-buffers #[0 "\205 \302\303\304\305#)\266\203\205 \306\307\310\303\304$\207" [buffer-file-name inhibit-changing-match-data "/\\(BRANCH\\|EDIT\\)_DESCRIPTION\\'" nil t string-match add-hook with-editor-post-finish-hook #[0 "\300\301!\205 \302 \207" [derived-mode-p magit-popup-mode magit-refresh-popup-buffer] 2]] 7]) | |
| 230 | (add-hook 'find-file-hook 'magit-edit-branch*description-check-buffers) | |
| 231 | (defalias 'magit-format-branch*description #[0 "\300 \211G\301\\\302\303\"\211\304\305GZ\306\"\307!\211\203& \310\311\312\"@\313\314#\202+ \310\315\313\316#\262R\207" [magit-branch-config-branch 19 format "branch.%s.description" " " make-string 32 magit-get propertize split-string "\n" face magit-popup-option-value "unset" magit-popup-disabled-argument] 11]) | |
| 232 | #@727 Set or unset the upstream of the current branch. | |
| 233 | With a prefix argument do so for another branch. | |
| 234 | ||
| 235 | When the branch in question already has an upstream then simply | |
| 236 | unsets it. Invoke this command again to set another upstream. | |
| 237 | ||
| 238 | Together the Git variables `branch.<name>.remote' and | |
| 239 | `branch.<name>.merge' define the upstream branch of the local | |
| 240 | branch named NAME. The value of `branch.<name>.remote' is the | |
| 241 | name of the upstream remote. The value of `branch.<name>.merge' | |
| 242 | is the full reference of the upstream branch, on the remote. | |
| 243 | ||
| 244 | Non-interactively, when UPSTREAM is non-nil, then always set it | |
| 245 | as the new upstream, regardless of whether another upstream was | |
| 246 | already set. When nil, then always unset. | |
| 247 | ||
| 248 | (fn BRANCH UPSTREAM) | |
| 249 | (defalias 'magit-set-branch*merge/remote #[514 "\300\"\210\301 \207" [magit-set-upstream-branch magit-refresh] 5 (#$ . 33495) (byte-code "\300\301!\211\302!?\205 \303!D\207" [magit-branch-config-branch "Change upstream of branch" magit-get-upstream-branch magit-read-upstream-branch] 4)]) | |
| 250 | (defalias 'magit-format-branch*merge/remote #[0 "\300 \211G\301\\\302\303\"\302\304\"\305!\306\232\203 \307\202 \310\311GZ\312\"\305!\211\2033 \313\314#\2028 \313\315\314\316#\262\317\311 GZ\312\"\305!\211\203V \313\314\n#\202[ \313\315\314\316#\262\260\207" [magit-branch-config-branch 20 format "branch.%s.merge" "branch.%s.remote" magit-get "." magit-branch-local magit-branch-remote make-string 32 propertize face "unset" magit-popup-disabled-argument "\n "] 16]) | |
| 251 | #@516 Cycle the value of `branch.<name>.rebase' for the current branch. | |
| 252 | With a prefix argument cycle the value for another branch. | |
| 253 | ||
| 254 | The Git variables `branch.<name>.rebase' controls whether pulling | |
| 255 | into the branch named NAME is done by rebasing that branch onto | |
| 256 | the fetched branch or by merging that branch. | |
| 257 | ||
| 258 | When `true' then pulling is done by rebasing. | |
| 259 | When `false' then pulling is done by merging. | |
| 260 | ||
| 261 | When that variable is undefined then the value of `pull.rebase' | |
| 262 | is used instead. It defaults to `false'. | |
| 263 | ||
| 264 | (fn BRANCH) | |
| 265 | (defalias 'magit-cycle-branch*rebase #[257 "\300\301\302\"\303\304\305$\207" [magit--set-popup-variable format "branch.%s.rebase" ("true" "false") "false" "pull.rebase"] 6 (#$ . 35015) (byte-code "\300\301!C\207" [magit-branch-config-branch "Cycle branch.<name>.rebase for"] 2)]) | |
| 266 | (defalias 'magit-format-branch*rebase #[0 "\300 \301\302\303\"\304\305\306G\307\\%\207" [magit-branch-config-branch magit--format-popup-variable:choices format "branch.%s.rebase" ("true" "false") "false" "pull.rebase" 20] 8]) | |
| 267 | #@473 Cycle the value of `branch.<name>.pushRemote' for the current branch. | |
| 268 | With a prefix argument cycle the value for another branch. | |
| 269 | ||
| 270 | The Git variable `branch.<name>.pushRemote' specifies the remote | |
| 271 | that the branch named NAME is usually pushed to. The value has | |
| 272 | to be the name of an existing remote. | |
| 273 | ||
| 274 | If that variable is undefined, then the value of the Git variable | |
| 275 | `remote.pushDefault' is used instead, provided that it is defined, | |
| 276 | which by default it is not. | |
| 277 | ||
| 278 | (fn BRANCH) | |
| 279 | (defalias 'magit-cycle-branch*pushRemote #[257 "\300\301\302\"\303 \304#\207" [magit--set-popup-variable format "branch.%s.pushRemote" magit-list-remotes "remote.pushDefault"] 5 (#$ . 36046) (byte-code "\300\301!C\207" [magit-branch-config-branch "Cycle branch.<name>.pushRemote for"] 2)]) | |
| 280 | (defalias 'magit-format-branch*pushRemote #[0 "\300 \301\302\303\"\304 \305\306G\307\\%\207" [magit-branch-config-branch magit--format-popup-variable:choices format "branch.%s.pushRemote" magit-list-remotes nil "remote.pushDefault" 20] 8]) | |
| 281 | #@322 Cycle the repository-local value of `pull.rebase'. | |
| 282 | ||
| 283 | The Git variable `pull.rebase' specifies whether pulling is done | |
| 284 | by rebasing or by merging. It can be overwritten using the Git | |
| 285 | variable `branch.<name>.rebase'. | |
| 286 | ||
| 287 | When `true' then pulling is done by rebasing. | |
| 288 | When `false' (the default) then pulling is done by merging. | |
| 289 | (defalias 'magit-cycle-pull\.rebase #[0 "\300\301\302\303#\207" [magit--set-popup-variable "pull.rebase" ("true" "false") "false"] 4 (#$ . 37058) nil]) | |
| 290 | (defalias 'magit-format-pull\.rebase #[0 "\300\301\302\303\304\305%\207" [magit--format-popup-variable:choices "pull.rebase" ("true" "false") "false" nil 19] 6]) | |
| 291 | #@236 Cycle the repository-local value of `remote.pushDefault'. | |
| 292 | ||
| 293 | The Git variable `remote.pushDefault' specifies the remote that | |
| 294 | local branches are usually pushed to. It can be overwritten | |
| 295 | using the Git variable `branch.<name>.pushRemote'. | |
| 296 | (defalias 'magit-cycle-remote\.pushDefault #[0 "\300\301\302 \"\207" [magit--set-popup-variable "remote.pushDefault" magit-list-remotes] 3 (#$ . 37700) nil]) | |
| 297 | (defalias 'magit-format-remote\.pushDefault #[0 "\300\301\302 \303\211\304%\207" [magit--format-popup-variable:choices "remote.pushDefault" magit-list-remotes nil 19] 6]) | |
| 298 | #@678 Cycle the repository-local value of `branch.autoSetupMerge'. | |
| 299 | ||
| 300 | The Git variable `branch.autoSetupMerge' under what circumstances | |
| 301 | creating a branch (named NAME) should result in the variables | |
| 302 | `branch.<name>.merge' and `branch.<name>.remote' being set | |
| 303 | according to the starting point used to create the branch. If | |
| 304 | the starting point isn't a branch, then these variables are never | |
| 305 | set. | |
| 306 | ||
| 307 | When `always' then the variables are set regardless of whether | |
| 308 | the starting point is a local or a remote branch. | |
| 309 | ||
| 310 | When `true' (the default) then the variable are set when the | |
| 311 | starting point is a remote branch, but not when it is a local | |
| 312 | branch. | |
| 313 | ||
| 314 | When `false' then the variables are never set. | |
| 315 | (defalias 'magit-cycle-branch*autoSetupMerge #[0 "\300\301\302\303#\207" [magit--set-popup-variable "branch.autoSetupMerge" ("always" "true" "false") "true"] 4 (#$ . 38271) nil]) | |
| 316 | (defalias 'magit-format-branch*autoSetupMerge #[0 "\300\301\302\303\304\305%\207" [magit--format-popup-variable:choices "branch.autoSetupMerge" ("always" "true" "false") "true" nil 23] 6]) | |
| 317 | #@640 Cycle the repository-local value of `branch.autoSetupRebase'. | |
| 318 | ||
| 319 | The Git variable `branch.autoSetupRebase' specifies whether | |
| 320 | creating a branch (named NAME) should result in the variable | |
| 321 | `branch.<name>.rebase' being set to `true'. | |
| 322 | ||
| 323 | When `always' then the variable is set regardless of whether the | |
| 324 | starting point is a local or a remote branch. | |
| 325 | ||
| 326 | When `local' then the variable are set when the starting point | |
| 327 | is a local branch, but not when it is a remote branch. | |
| 328 | ||
| 329 | When `remote' then the variable are set when the starting point | |
| 330 | is a remote branch, but not when it is a local branch. | |
| 331 | ||
| 332 | When `never' (the default) then the variable is never set. | |
| 333 | (defalias 'magit-cycle-branch*autoSetupRebase #[0 "\300\301\302\303#\207" [magit--set-popup-variable "branch.autoSetupRebase" ("always" "local" "remote" "never") "never"] 4 (#$ . 39323) nil]) | |
| 334 | (defalias 'magit-format-branch*autoSetupRebase #[0 "\300\301\302\303\304\305%\207" [magit--format-popup-variable:choices "branch.autoSetupRebase" ("always" "local" "remote" "never") "never" nil 23] 6]) | |
| 335 | (provide 'magit-branch) | |
