From 93e74cc4a25f302eafbbf561be0e59e679c6e60a Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Wed, 6 Jan 2016 11:51:29 +0100 Subject: [PATCH] new version of magit. --- elpa/magit-20151223.1425/magit.info | 158 ---------------- .../AUTHORS.md | 2 +- .../COPYING | 0 .../dir | 0 .../git-rebase.el | 2 +- .../magit-apply.el | 2 +- .../magit-autoloads.el | 36 ++-- .../magit-bisect.el | 14 +- .../magit-blame.el | 2 +- .../magit-commit.el | 2 +- .../magit-core.el | 2 +- .../magit-diff.el | 16 +- .../magit-ediff.el | 2 +- .../magit-extras.el | 2 +- .../magit-git.el | 21 ++- .../magit-log.el | 4 +- .../magit-mode.el | 168 ++++++++++-------- .../magit-pkg.el | 2 +- .../magit-process.el | 4 +- .../magit-remote.el | 53 +++--- .../magit-section.el | 30 +++- .../magit-sequence.el | 2 +- .../magit-stash.el | 2 +- .../magit-utils.el | 2 +- .../magit-wip.el | 2 +- .../magit.el | 11 +- elpa/magit-20160102.906/magit.info | 158 ++++++++++++++++ .../magit.info-1 | 34 ++-- .../magit.info-2 | Bin 21336 -> 21491 bytes 29 files changed, 393 insertions(+), 340 deletions(-) delete mode 100644 elpa/magit-20151223.1425/magit.info rename elpa/{magit-20151223.1425 => magit-20160102.906}/AUTHORS.md (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/COPYING (100%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/dir (100%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/git-rebase.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-apply.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-autoloads.el (97%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-bisect.el (95%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-blame.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-commit.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-core.el (97%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-diff.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-ediff.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-extras.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-git.el (98%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-log.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-mode.el (91%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-pkg.el (80%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-process.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-remote.el (94%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-section.el (97%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-sequence.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-stash.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-utils.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit-wip.el (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit.el (99%) create mode 100644 elpa/magit-20160102.906/magit.info rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit.info-1 (99%) rename elpa/{magit-20151223.1425 => magit-20160102.906}/magit.info-2 (98%) diff --git a/elpa/magit-20151223.1425/magit.info b/elpa/magit-20151223.1425/magit.info deleted file mode 100644 index 2f6b7f8c..00000000 --- a/elpa/magit-20151223.1425/magit.info +++ /dev/null @@ -1,158 +0,0 @@ -This is magit.info, produced by makeinfo version 5.2 from magit.texi. - -Magit is an interface to the version control system Git, implemented as -an Emacs package. Magit aspires to be a complete Git porcelain. While -we cannot (yet) claim that Magit wraps and improves upon each and every -Git command, it is complete enough to allow even experienced Git users -to perform almost all of their daily version control tasks directly from -within Emacs. While many fine Git clients exist, only Magit and Git -itself deserve to be called porcelains. - - Copyright (C) 2015 Jonas Bernoulli - - You can redistribute this document and/or modify it under the terms - of the GNU General Public License as published by the Free Software - Foundation, either version 3 of the License, or (at your option) - any later version. - - This document is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. -INFO-DIR-SECTION Emacs -START-INFO-DIR-ENTRY -* Magit: (magit). Using Git from Emacs with Magit. -END-INFO-DIR-ENTRY - - -Indirect: -magit.info-1: 1217 -magit.info-2: 306253 - -Tag Table: -(Indirect) -Node: Top1217 -Node: Introduction5670 -Node: Installation10363 -Node: Updating from an older release10738 -Node: Installing from an Elpa archive12333 -Node: Installing from the Git repository13891 -Node: Post-installation tasks16128 -Node: Getting started17654 -Node: Interface concepts23389 -Node: Modes and Buffers23715 -Node: Switching Buffers25330 -Node: Naming Buffers28394 -Node: Quitting Windows31229 -Node: Automatic save32815 -Node: Automatic refresh and revert33880 -Node: Sections38680 -Node: Section movement39632 -Node: Section visibility43559 -Node: Section hooks47150 -Node: Section types and values49188 -Node: Section options50458 -Node: Popup buffers and prefix commands50930 -Node: Completion and confirmation52244 -Node: Running Git55150 -Node: Viewing Git output55386 -Node: Running Git manually56386 -Node: Git executable58512 -Node: Global Git arguments60519 -Node: Inspecting61326 -Node: Status buffer62453 -Node: Status sections64976 -Node: Status header sections69723 -Node: Status options72282 -Node: Logging73006 -Node: Refreshing logs75373 -Node: Log Buffer76758 -Node: Select from log79847 -Node: Reflog80787 -Node: Diffing81265 -Node: Refreshing diffs84077 -Node: Diff buffer87058 -Node: Diff options88960 -Node: Revision buffer90592 -Node: Ediffing91547 -Node: References buffer94596 -Node: References sections99306 -Node: Bisecting100181 -Node: Visiting blobs101677 -Node: Blaming102186 -Node: Manipulating105506 -Node: Repository setup105798 -Node: Staging and unstaging106838 -Node: Staging from file-visiting buffers109187 -Node: Applying110355 -Node: Committing111998 -Node: Initiating a commit112581 -Node: Editing commit messages115893 -Node: Branching126289 -Node: Merging138576 -Node: Rebasing140660 -Node: Editing rebase sequences143608 -Node: Rebase sequence log146642 -Node: Cherry picking153386 -Node: Reverting154992 -Node: Resetting156355 -Node: Stashing157865 -Node: Transferring161010 -Node: Remotes161248 -Node: Fetching162534 -Node: Pulling163511 -Node: Pushing164237 -Node: Creating and sending patches168566 -Node: Applying patches169261 -Node: Miscellaneous170259 -Node: Tagging170550 -Node: Notes171335 -Node: Submodules173860 -Node: Common commands175180 -Node: Wip modes176928 -Node: Minor mode for buffers visiting files183664 -Node: Minor mode for buffers visiting blobs185807 -Node: Customizing186612 -Node: Per-repository configuration188284 -Node: Essential settings189918 -Node: Safety190242 -Node: Performance193476 -Node: Plumbing200122 -Node: Calling Git200750 -Node: Getting a value from Git202273 -Node: Calling Git for effect205377 -Node: Section plumbing211881 -Node: Creating sections212109 -Node: Section selection215912 -Node: Matching sections217592 -Node: Refreshing buffers222794 -Node: Conventions225929 -Node: Confirmation and completion226106 -Node: Theming Faces227004 -Node: FAQ235155 -Node: Magit is slow236325 -Node: I changed several thousand files at once and now Magit is unusable236526 -Node: I am having problems committing237242 -Node: I don't like how branching and pushing works237695 -Node: I cannot install the pre-requisites for Magit v2238175 -Node: I am using an Emacs release older than v244238649 -Node: I am using a Git release older than v194240262 -Node: I am using MS Windows and cannot push with Magit241249 -Node: How to install the gitman info manual?241828 -Node: How can I show Git's output?244354 -Node: Expanding a file to show the diff causes it to disappear245166 -Node: Point is wrong in the COMMIT_EDITMSG buffer245692 -Node: Can Magit be used as ediff-version-control-package?246710 -Node: How to show diffs for gpg-encrypted files?248734 -Node: Emacs 245 hangs when loading Magit249325 -Node: Keystroke Index249844 -Node: Command Index277035 -Node: Function Index306253 -Node: Variable Index317867 - -End Tag Table - - -Local Variables: -coding: utf-8 -End: diff --git a/elpa/magit-20151223.1425/AUTHORS.md b/elpa/magit-20160102.906/AUTHORS.md similarity index 99% rename from elpa/magit-20151223.1425/AUTHORS.md rename to elpa/magit-20160102.906/AUTHORS.md index 4425770b..8f3761e0 100644 --- a/elpa/magit-20151223.1425/AUTHORS.md +++ b/elpa/magit-20160102.906/AUTHORS.md @@ -184,7 +184,7 @@ Contributors - Prathamesh Sonpatki - rabio - Rafael Laboissiere -- Raimon Grau +- Raimon Grau - Ramkumar Ramachandra - Remco van 't Veer - Rémi Vanicat diff --git a/elpa/magit-20151223.1425/COPYING b/elpa/magit-20160102.906/COPYING similarity index 100% rename from elpa/magit-20151223.1425/COPYING rename to elpa/magit-20160102.906/COPYING diff --git a/elpa/magit-20151223.1425/dir b/elpa/magit-20160102.906/dir similarity index 100% rename from elpa/magit-20151223.1425/dir rename to elpa/magit-20160102.906/dir diff --git a/elpa/magit-20151223.1425/git-rebase.el b/elpa/magit-20160102.906/git-rebase.el similarity index 99% rename from elpa/magit-20151223.1425/git-rebase.el rename to elpa/magit-20160102.906/git-rebase.el index 1ef275f0..fd607185 100644 --- a/elpa/magit-20151223.1425/git-rebase.el +++ b/elpa/magit-20160102.906/git-rebase.el @@ -1,6 +1,6 @@ ;;; git-rebase.el --- Edit Git rebase files -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20151223.1425/magit-apply.el b/elpa/magit-20160102.906/magit-apply.el similarity index 99% rename from elpa/magit-20151223.1425/magit-apply.el rename to elpa/magit-20160102.906/magit-apply.el index 850a83cb..0b6142ae 100644 --- a/elpa/magit-20151223.1425/magit-apply.el +++ b/elpa/magit-20160102.906/magit-apply.el @@ -1,6 +1,6 @@ ;;; magit-apply.el --- apply Git diffs -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20151223.1425/magit-autoloads.el b/elpa/magit-20160102.906/magit-autoloads.el similarity index 97% rename from elpa/magit-20151223.1425/magit-autoloads.el rename to elpa/magit-20160102.906/magit-autoloads.el index c5347fd8..e1a61dd1 100644 --- a/elpa/magit-20151223.1425/magit-autoloads.el +++ b/elpa/magit-20160102.906/magit-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "git-rebase" "git-rebase.el" (22140 7080 0 +;;;### (autoloads nil "git-rebase" "git-rebase.el" (22154 38258 0 ;;;;;; 0)) ;;; Generated autoloads from git-rebase.el @@ -23,7 +23,7 @@ running 'man git-rebase' at the command line) for details. ;;;*** -;;;### (autoloads nil "magit" "magit.el" (22140 7080 0 0)) +;;;### (autoloads nil "magit" "magit.el" (22154 38258 0 0)) ;;; Generated autoloads from magit.el (autoload 'magit-status "magit" "\ @@ -492,7 +492,7 @@ Git, and Emacs in the echo area. ;;;*** -;;;### (autoloads nil "magit-apply" "magit-apply.el" (22140 7080 +;;;### (autoloads nil "magit-apply" "magit-apply.el" (22154 38258 ;;;;;; 0 0)) ;;; Generated autoloads from magit-apply.el @@ -529,7 +529,7 @@ Remove all changes from the staging area. ;;;*** -;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22140 7080 +;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22154 38258 ;;;;;; 0 0)) ;;; Generated autoloads from magit-bisect.el (autoload 'magit-bisect-popup "magit-bisect" nil t) @@ -581,7 +581,7 @@ bisect run'. ;;;*** -;;;### (autoloads nil "magit-blame" "magit-blame.el" (22140 7080 +;;;### (autoloads nil "magit-blame" "magit-blame.el" (22154 38258 ;;;;;; 0 0)) ;;; Generated autoloads from magit-blame.el (autoload 'magit-blame-popup "magit-blame" nil t) @@ -606,7 +606,7 @@ only arguments available from `magit-blame-popup' should be used. ;;;*** -;;;### (autoloads nil "magit-commit" "magit-commit.el" (22140 7080 +;;;### (autoloads nil "magit-commit" "magit-commit.el" (22154 38258 ;;;;;; 0 0)) ;;; Generated autoloads from magit-commit.el @@ -689,7 +689,7 @@ Create a squash commit targeting COMMIT and instantly rebase. ;;;*** -;;;### (autoloads nil "magit-diff" "magit-diff.el" (22140 7080 0 +;;;### (autoloads nil "magit-diff" "magit-diff.el" (22154 38258 0 ;;;;;; 0)) ;;; Generated autoloads from magit-diff.el @@ -755,7 +755,7 @@ for a revision. ;;;*** -;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22140 7080 +;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22154 38258 ;;;;;; 0 0)) ;;; Generated autoloads from magit-ediff.el (autoload 'magit-ediff-popup "magit-ediff" nil t) @@ -836,7 +836,7 @@ Show changes introduced by COMMIT using Ediff. ;;;*** -;;;### (autoloads nil "magit-extras" "magit-extras.el" (22140 7080 +;;;### (autoloads nil "magit-extras" "magit-extras.el" (22154 38258 ;;;;;; 0 0)) ;;; Generated autoloads from magit-extras.el @@ -907,7 +907,7 @@ on a position in a file-visiting buffer. ;;;*** -;;;### (autoloads nil "magit-log" "magit-log.el" (22140 7080 0 0)) +;;;### (autoloads nil "magit-log" "magit-log.el" (22154 38258 0 0)) ;;; Generated autoloads from magit-log.el (autoload 'magit-log-current "magit-log" "\ @@ -975,7 +975,7 @@ Show commits in a branch that are not merged in the upstream branch. ;;;*** -;;;### (autoloads nil "magit-remote" "magit-remote.el" (22140 7080 +;;;### (autoloads nil "magit-remote" "magit-remote.el" (22154 38258 ;;;;;; 0 0)) ;;; Generated autoloads from magit-remote.el @@ -1115,7 +1115,7 @@ Push somewhere without using an explicit refspec. This command simply runs \"git push -v [ARGS]\". ARGS are the arguments specified in the popup buffer. No explicit refspec arguments are used. Instead the behavior depends on at least -these Git variables: `push.default', `branch.pushDefault', +these Git variables: `push.default', `remote.pushDefault', `branch..pushRemote', `branch..remote', `branch..merge', and `remote..push'. @@ -1139,7 +1139,7 @@ The REMOTE is read in the minibuffer. This command simply runs \"git push -v [ARGS] REMOTE\". ARGS are the arguments specified in the popup buffer. No refspec arguments are used. Instead the behavior depends on at least -these Git variables: `push.default', `branch.pushDefault', +these Git variables: `push.default', `remote.pushDefault', `branch..pushRemote', `branch..remote', `branch..merge', and `remote..push'. @@ -1174,8 +1174,8 @@ is asked to pull. START has to be reachable from that commit. ;;;*** -;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22140 -;;;;;; 7080 0 0)) +;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22154 +;;;;;; 38258 0 0)) ;;; Generated autoloads from magit-sequence.el (autoload 'magit-sequencer-continue "magit-sequence" "\ @@ -1323,7 +1323,7 @@ Abort the current rebase operation, restoring the original branch. ;;;*** -;;;### (autoloads nil "magit-stash" "magit-stash.el" (22140 7080 +;;;### (autoloads nil "magit-stash" "magit-stash.el" (22154 38258 ;;;;;; 0 0)) ;;; Generated autoloads from magit-stash.el (autoload 'magit-stash-popup "magit-stash" nil t) @@ -1423,7 +1423,7 @@ Show all diffs of a stash in a buffer. ;;;*** -;;;### (autoloads nil "magit-wip" "magit-wip.el" (22140 7080 0 0)) +;;;### (autoloads nil "magit-wip" "magit-wip.el" (22154 38258 0 0)) ;;; Generated autoloads from magit-wip.el (defvar magit-wip-after-save-mode nil "\ @@ -1490,7 +1490,7 @@ command which is about to be called are committed. ;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-mode.el" ;;;;;; "magit-pkg.el" "magit-process.el" "magit-section.el" "magit-utils.el") -;;;;;; (22140 7080 159081 0)) +;;;;;; (22154 38258 437343 0)) ;;;*** diff --git a/elpa/magit-20151223.1425/magit-bisect.el b/elpa/magit-20160102.906/magit-bisect.el similarity index 95% rename from elpa/magit-20151223.1425/magit-bisect.el rename to elpa/magit-20160102.906/magit-bisect.el index 8a7702cb..67c63da8 100644 --- a/elpa/magit-20151223.1425/magit-bisect.el +++ b/elpa/magit-20160102.906/magit-bisect.el @@ -1,6 +1,6 @@ ;;; magit-bisect.el --- bisect support for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2011-2015 The Magit Project Contributors +;; Copyright (C) 2011-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -70,7 +70,7 @@ other actions from the bisect popup (\ (interactive (if (magit-bisect-in-progress-p) (user-error "Already bisecting") (magit-bisect-start-read-args))) - (magit-bisect-async "start" (list bad good) t)) + (magit-git-bisect "start" (list bad good) t)) (defun magit-bisect-start-read-args () (let ((b (magit-read-branch-or-commit "Start bisect with bad revision"))) @@ -90,7 +90,7 @@ other actions from the bisect popup (\ Use this after you have asserted that the commit does not contain the bug in question." (interactive) - (magit-bisect-async "good")) + (magit-git-bisect "good")) ;;;###autoload (defun magit-bisect-bad () @@ -98,7 +98,7 @@ the bug in question." Use this after you have asserted that the commit does contain the bug in question." (interactive) - (magit-bisect-async "bad")) + (magit-git-bisect "bad")) ;;;###autoload (defun magit-bisect-skip () @@ -106,7 +106,7 @@ bug in question." Use this if for some reason the current commit is not a good one to test. This command lets Git choose a different one." (interactive) - (magit-bisect-async "skip")) + (magit-git-bisect "skip")) ;;;###autoload (defun magit-bisect-run (cmdline &optional bad good) @@ -120,9 +120,9 @@ bisect run'." (cons (read-shell-command "Bisect shell command: ") args))) (when (and bad good) (magit-bisect-start bad good)) - (magit-bisect-async "run" (list cmdline))) + (magit-git-bisect "run" (list cmdline))) -(defun magit-bisect-async (subcommand &optional args no-assert) +(defun magit-git-bisect (subcommand &optional args no-assert) (unless (or no-assert (magit-bisect-in-progress-p)) (user-error "Not bisecting")) (magit-with-toplevel diff --git a/elpa/magit-20151223.1425/magit-blame.el b/elpa/magit-20160102.906/magit-blame.el similarity index 99% rename from elpa/magit-20151223.1425/magit-blame.el rename to elpa/magit-20160102.906/magit-blame.el index 983e4dd8..064b7cd7 100644 --- a/elpa/magit-20151223.1425/magit-blame.el +++ b/elpa/magit-20160102.906/magit-blame.el @@ -1,6 +1,6 @@ ;;; magit-blame.el --- blame support for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2012-2015 The Magit Project Contributors +;; Copyright (C) 2012-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20151223.1425/magit-commit.el b/elpa/magit-20160102.906/magit-commit.el similarity index 99% rename from elpa/magit-20151223.1425/magit-commit.el rename to elpa/magit-20160102.906/magit-commit.el index 7a36c89a..d49ff7d8 100644 --- a/elpa/magit-20151223.1425/magit-commit.el +++ b/elpa/magit-20160102.906/magit-commit.el @@ -1,6 +1,6 @@ ;;; magit-commit.el --- create Git commits -*- lexical-binding: t -*- -;; Copyright (C) 2008-2015 The Magit Project Contributors +;; Copyright (C) 2008-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20151223.1425/magit-core.el b/elpa/magit-20160102.906/magit-core.el similarity index 97% rename from elpa/magit-20151223.1425/magit-core.el rename to elpa/magit-20160102.906/magit-core.el index 418fc693..a9efd588 100644 --- a/elpa/magit-20151223.1425/magit-core.el +++ b/elpa/magit-20160102.906/magit-core.el @@ -1,6 +1,6 @@ ;;; magit-core.el --- core functionality -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20151223.1425/magit-diff.el b/elpa/magit-20160102.906/magit-diff.el similarity index 99% rename from elpa/magit-20151223.1425/magit-diff.el rename to elpa/magit-20160102.906/magit-diff.el index 5b1e409c..51cc3f7a 100644 --- a/elpa/magit-20151223.1425/magit-diff.el +++ b/elpa/magit-20160102.906/magit-diff.el @@ -1,6 +1,6 @@ ;;; magit-diff.el --- inspect Git diffs -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -960,14 +960,14 @@ which, as the name suggests always visits the actual file." (or (get-file-buffer file) (find-file-noselect file)))) (magit-display-file-buffer buffer) - (when line - (goto-char (point-min)) - (forward-line (1- line)) - (when col - (move-to-column col))) - (when unmerged-p - (smerge-start-session)) (with-current-buffer buffer + (when line + (goto-char (point-min)) + (forward-line (1- line)) + (when col + (move-to-column col))) + (when unmerged-p + (smerge-start-session)) (run-hooks 'magit-diff-visit-file-hook))))) (defvar magit-display-file-buffer-function diff --git a/elpa/magit-20151223.1425/magit-ediff.el b/elpa/magit-20160102.906/magit-ediff.el similarity index 99% rename from elpa/magit-20151223.1425/magit-ediff.el rename to elpa/magit-20160102.906/magit-ediff.el index 2fb73349..4e06ccfe 100644 --- a/elpa/magit-20151223.1425/magit-ediff.el +++ b/elpa/magit-20160102.906/magit-ediff.el @@ -1,6 +1,6 @@ ;;; magit-ediff.el --- Ediff extension for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20151223.1425/magit-extras.el b/elpa/magit-20160102.906/magit-extras.el similarity index 99% rename from elpa/magit-20151223.1425/magit-extras.el rename to elpa/magit-20160102.906/magit-extras.el index 8355901a..e66611d9 100644 --- a/elpa/magit-20151223.1425/magit-extras.el +++ b/elpa/magit-20160102.906/magit-extras.el @@ -1,6 +1,6 @@ ;;; magit-extras.el --- additional functionality for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2008-2015 The Magit Project Contributors +;; Copyright (C) 2008-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20151223.1425/magit-git.el b/elpa/magit-20160102.906/magit-git.el similarity index 98% rename from elpa/magit-20151223.1425/magit-git.el rename to elpa/magit-20160102.906/magit-git.el index f8274699..b9e33c3b 100644 --- a/elpa/magit-20151223.1425/magit-git.el +++ b/elpa/magit-20160102.906/magit-git.el @@ -1,6 +1,6 @@ ;;; magit-git.el --- Git functionality -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -965,12 +965,12 @@ where COMMITS is the number of commits in TAG but not in REV." (magit-git-items "ls-files" "-z" "--stage"))) (defun magit-branch-p (string) - (and (or (member string (magit-list-branches)) - (member string (magit-list-branch-names))) t)) + (or (car (member string (magit-list-branches))) + (car (member string (magit-list-branch-names))))) -(defun magit-local-branch-p (branch) - (and (or (member branch (magit-list-local-branches)) - (member branch (magit-list-local-branch-names))) t)) +(defun magit-local-branch-p (string) + (or (car (member string (magit-list-local-branches))) + (car (member string (magit-list-local-branch-names))))) (defun magit-branch-set-face (branch) (propertize branch 'face (if (magit-local-branch-p branch) @@ -1097,7 +1097,8 @@ Return a list of two integers: (A>B B>A)." (defmacro magit-with-temp-index (tree arg &rest body) (declare (indent 2) (debug (form form body))) (let ((file (cl-gensym "file"))) - `(let ((,file (magit-git-dir (make-temp-name "index.magit.")))) + `(let ((,file (magit-convert-git-filename + (magit-git-dir (make-temp-name "index.magit."))))) (setq ,file (or (file-remote-p ,file 'localname) ,file)) (unwind-protect (progn (--when-let ,tree @@ -1223,7 +1224,8 @@ Return a list of two integers: (A>B B>A)." (exclude (or exclude current)) (default (or (and (not (equal atpoint exclude)) atpoint) (and (not (equal current exclude)) current) - secondary-default (magit-get-previous-branch)))) + secondary-default + (magit-get-previous-branch)))) (magit-completing-read prompt (delete exclude (magit-list-branch-names)) nil t nil 'magit-revision-history default))) @@ -1234,7 +1236,8 @@ Return a list of two integers: (A>B B>A)." (exclude (or exclude current)) (default (or (and (not (equal atpoint exclude)) atpoint) (and (not (equal current exclude)) current) - secondary-default (magit-get-previous-branch)))) + secondary-default + (magit-get-previous-branch)))) (or (magit-completing-read prompt (delete exclude (magit-list-refnames)) nil nil nil 'magit-revision-history default) (user-error "Nothing selected")))) diff --git a/elpa/magit-20151223.1425/magit-log.el b/elpa/magit-20160102.906/magit-log.el similarity index 99% rename from elpa/magit-20151223.1425/magit-log.el rename to elpa/magit-20160102.906/magit-log.el index 72397c68..653dffa6 100644 --- a/elpa/magit-20151223.1425/magit-log.el +++ b/elpa/magit-20160102.906/magit-log.el @@ -1,6 +1,6 @@ ;;; magit-log.el --- inspect Git history -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -1346,7 +1346,7 @@ commits." (if (equal (magit-rev-parse "HEAD") (magit-rev-parse "@{upstream}")) (magit-insert-recent-commits t) - (magit-insert-unpulled-from-pushremote))) + (magit-insert-unpulled-from-upstream))) (defun magit-insert-unpulled-cherries () "Insert section showing unpulled commits. diff --git a/elpa/magit-20151223.1425/magit-mode.el b/elpa/magit-20160102.906/magit-mode.el similarity index 91% rename from elpa/magit-20151223.1425/magit-mode.el rename to elpa/magit-20160102.906/magit-mode.el index 158e953f..a277ac5b 100644 --- a/elpa/magit-20151223.1425/magit-mode.el +++ b/elpa/magit-20160102.906/magit-mode.el @@ -1,6 +1,6 @@ ;;; magit-mode.el --- create and refresh Magit buffers -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -217,7 +217,9 @@ NUMBER An integer or float. Revert the buffers asynchronously. If NUMBER is positive, then mention each buffer as it is being reverted. If it is negative, then be quiet about it. If user input arrives, then stop reverting. After - (the absolute value of) NUMBER seconds resume reverting." + (the absolute value of) NUMBER seconds resume reverting. + +Also see option `magit-revert-buffers-only-for-tracked-files'." :package-version '(magit . "2.1.0") :group 'magit :type '(choice @@ -231,6 +233,20 @@ NUMBER An integer or float. Revert the buffers asynchronously. (set-default var val) (magit-revert-buffers-set-timer))) +(defcustom magit-revert-buffers-only-for-tracked-files nil + "Whether to revert only buffers that visit tracked files. + +If non-nil, then only tracked files may be reverted. If nil, +then all files in the current repository may potentially be +reverted. Reverting untracked files should be safe and limiting +to only tracked files has the potential of causing very noticable +delays, so the default is to revert all buffers. + +Also see option `magit-revert-buffers'." + :package-version '(magit . "2.4.0") + :group 'magit + :type 'boolean) + (defcustom magit-after-revert-hook '(magit-refresh-vc-mode-line) "Normal hook for `magit-revert-buffer' to run after reverting. @@ -813,7 +829,6 @@ tracked in the current repository." beg (line-end-position)))) (t t))))))))) - (defvar inhibit-magit-revert nil) (defvar magit-revert-buffers-backlog nil) @@ -826,57 +841,44 @@ buffers that visit files being tracked in the current repository. When called interactively then the revert is forced." (interactive (list t)) - (when (or force (and magit-revert-buffers (not inhibit-magit-revert))) - (-when-let (topdir (magit-toplevel)) - (let* ((tracked (magit-revision-files "HEAD")) - (buffers - (if (> (length tracked) - (length (buffer-list))) - (--filter - (let ((file (buffer-file-name it))) - (and file - (equal (file-remote-p file) - (file-remote-p topdir)) - (file-in-directory-p file topdir) - (member (file-relative-name file topdir) tracked))) - (buffer-list)) - (--mapcat - (--when-let (find-buffer-visiting (expand-file-name it topdir)) - (list it)) - tracked)))) - (when (and buffers - (or force - (not (eq magit-revert-buffers 'ask)) - (magit-confirm 'revert-buffer - "Revert %s from visited file" - "Revert %i buffers from visited files" - (mapcar #'buffer-name buffers)))) - (cond - ((numberp magit-revert-buffers) - (magit-revert-buffers-async buffers)) - ((eq magit-revert-buffers 'silent) - (mapc #'magit-revert-buffer buffers)) - (t - (let ((cnt (length buffers))) - (when (> cnt 0) - (message "Reverting (up to) %s file-visiting buffer(s)..." cnt) - (setq cnt (length (-non-nil (mapcar #'magit-revert-buffer - buffers)))) - (if (> cnt 0) - (pcase magit-revert-buffers - (`t - (message "Reverting %s file-visiting buffer(s)...done" cnt)) - (`usage - (message - "Reverting %s file-visiting buffer(s)...done%s%s%s" cnt + (-when-let* ((- (or force + (and magit-revert-buffers + (not inhibit-magit-revert)))) + (topdir (magit-toplevel)) + (buffers (magit-revert-list-modified-buffers topdir)) + (- (or force + (not (eq magit-revert-buffers 'ask)) + (magit-confirm 'revert-buffer + "Revert %s from visited file" + "Revert %i buffers from visited files" + (mapcar #'buffer-name buffers))))) + (if (numberp magit-revert-buffers) + (magit-revert-buffers-async buffers) + (magit-revert-buffers-sync buffers force)))) + +(add-hook 'git-commit-setup-hook #'magit-revert-buffers) + +(defun magit-revert-buffers-sync (buffers force) + (if (eq magit-revert-buffers 'silent) + (mapc #'magit-revert-buffer buffers) + (let ((cnt (length buffers))) + (message "Reverting (up to) %s file-visiting buffer(s)..." cnt) + (setq cnt (length (-non-nil (mapcar #'magit-revert-buffer buffers)))) + (if (> cnt 0) + (let ((s (if (> cnt 1) "s" ""))) + (pcase magit-revert-buffers + (`t + (message "Reverting %s file-visiting buffer%s...done" cnt s)) + (`usage + (message "Reverting %s file-visiting buffer%s...done%s%s%s" cnt s (substitute-command-keys "\n This can be undone using `\\[undo]' in the ") "affected buffers\n Customize behavior using `M-x " "customize-option RET magit-revert-buffers RET'")) - ((or `nil `ask) - (message "Reverting %s file-visiting buffer(s)...done%s" - cnt (if force " (forced)" "")))) - (message "(No buffers need to be reverted)"))))))))))) + ((or `nil `ask) + (message "Reverting %s file-visiting buffer%s...done%s" + cnt s (if force " (forced)" ""))))) + (message "(No buffers need to be reverted)"))))) (defun magit-revert-buffers-async (&optional buffers) (setq buffers (nconc buffers (--filter (not (memq it buffers)) @@ -889,28 +891,49 @@ When called interactively then the revert is forced." (setq magit-revert-buffers-backlog buffers)) (defun magit-revert-buffer (&optional buffer) - "Revert the current file-visiting buffer." - (let (ret) - (with-current-buffer (or buffer (current-buffer)) - (if (and (file-readable-p buffer-file-name) - (not (verify-visited-file-modtime (current-buffer)))) - (if magit-blame-mode - (progn (message "Reverting %s inhibited due to magit-blame-mode" - buffer-file-name) - (run-hooks 'magit-not-reverted-hook)) - (if (or (eq magit-revert-buffers 'silent) - (and (numberp magit-revert-buffers) - (< magit-revert-buffers 0))) - (revert-buffer 'ignore-auto t t) - (message "Reverting buffer `%s'..." (buffer-name)) + "Revert the current buffer. +If optional BUFFER is non-nil, then revert that instead. +The buffer is expected to visit a file. Return t if the +buffer had to be reverted, nil otherwise." + (with-current-buffer (or buffer (current-buffer)) + (if (and (file-readable-p buffer-file-name) + (not (verify-visited-file-modtime (current-buffer)))) + (if magit-blame-mode + (progn (message "Reverting %s inhibited due to magit-blame-mode" + buffer-file-name) + (run-hooks 'magit-not-reverted-hook) + nil) + (if (or (eq magit-revert-buffers 'silent) + (and (numberp magit-revert-buffers) + (< magit-revert-buffers 0))) (revert-buffer 'ignore-auto t t) - (message "Reverting buffer `%s'...done" (buffer-name))) - (run-hooks 'magit-after-revert-hook) - (setq ret t)) - (run-hooks 'magit-not-reverted-hook))) - ret)) + (message "Reverting buffer `%s'..." (buffer-name)) + (revert-buffer 'ignore-auto t t) + (message "Reverting buffer `%s'...done" (buffer-name))) + (run-hooks 'magit-after-revert-hook) + t) + (run-hooks 'magit-not-reverted-hook) + nil))) + +(defun magit-revert-list-modified-buffers (topdir) + (if magit-revert-buffers-only-for-tracked-files + (let ((tracked (magit-revision-files "HEAD"))) + (if (> (length tracked) + (length (buffer-list))) + (--filter (magit-revert-buffer-p it topdir tracked) + (buffer-list)) + (--keep (find-buffer-visiting (expand-file-name it topdir)) tracked))) + (--filter (magit-revert-buffer-p it topdir) + (buffer-list)))) -(add-hook 'git-commit-setup-hook #'magit-revert-buffers) +(defun magit-revert-buffer-p (buffer topdir &optional tracked) + (let ((file (buffer-file-name buffer))) + (and file + (equal (file-remote-p file) + (file-remote-p topdir)) + (file-in-directory-p file topdir) + (or (not tracked) + (member (file-relative-name file topdir) tracked))))) (defun magit-refresh-vc-mode-line () "Update `vc-mode' which is displayed in the mode-line. @@ -944,8 +967,9 @@ Like `vc-mode-line' but simpler, more efficient, and less buggy." (defun magit-after-save-refresh-buffers () (dolist (buffer magit-after-save-refresh-buffers) - (with-current-buffer buffer - (magit-refresh-buffer))) + (when (buffer-live-p buffer) + (with-current-buffer buffer + (magit-refresh-buffer)))) (setq magit-after-save-refresh-buffers nil) (remove-hook 'post-command-hook 'magit-after-save-refresh-buffers)) diff --git a/elpa/magit-20151223.1425/magit-pkg.el b/elpa/magit-20160102.906/magit-pkg.el similarity index 80% rename from elpa/magit-20151223.1425/magit-pkg.el rename to elpa/magit-20160102.906/magit-pkg.el index 0c7e4c8e..3d69675b 100644 --- a/elpa/magit-20151223.1425/magit-pkg.el +++ b/elpa/magit-20160102.906/magit-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit" "20151223.1425" "A Git porcelain inside Emacs" +(define-package "magit" "20160102.906" "A Git porcelain inside Emacs" '((emacs "24.4") (async "20150909.2257") (dash "20151021.113") diff --git a/elpa/magit-20151223.1425/magit-process.el b/elpa/magit-20160102.906/magit-process.el similarity index 99% rename from elpa/magit-20151223.1425/magit-process.el rename to elpa/magit-20160102.906/magit-process.el index fddb3bf9..2582e603 100644 --- a/elpa/magit-20151223.1425/magit-process.el +++ b/elpa/magit-20160102.906/magit-process.el @@ -1,6 +1,6 @@ ;;; magit-process.el --- process functionality -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -761,7 +761,7 @@ as argument." (defun magit-process-wait () (while (and magit-this-process (eq (process-status magit-this-process) 'run)) - (sit-for 0.1 t))) + (sleep-for 0.005))) (defun tramp-sh-handle-start-file-process--magit-tramp-process-environment (fn name buffer program &rest args) diff --git a/elpa/magit-20151223.1425/magit-remote.el b/elpa/magit-20160102.906/magit-remote.el similarity index 94% rename from elpa/magit-20151223.1425/magit-remote.el rename to elpa/magit-20160102.906/magit-remote.el index cbca5b52..3cb6b022 100644 --- a/elpa/magit-20151223.1425/magit-remote.el +++ b/elpa/magit-20160102.906/magit-remote.el @@ -1,6 +1,6 @@ ;;; magit-remote.el --- transfer Git commits -*- lexical-binding: t -*- -;; Copyright (C) 2008-2015 The Magit Project Contributors +;; Copyright (C) 2008-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -33,16 +33,16 @@ ;;; Clone -(defcustom magit-clone-set-branch.pushDefault 'ask - "Whether to set the value of `branch.pushDefault' after cloning. +(defcustom magit-clone-set-remote.pushDefault 'ask + "Whether to set the value of `remote.pushDefault' after cloning. If t, then set without asking. If nil, then don't set. If `ask', then ask." :package-version '(magit . "2.4.0") :group 'magit-commands - :type '(choice (const "set" t) - (const "ask" ask) - (const "don't set" nil))) + :type '(choice (const :tag "set" t) + (const :tag "ask" ask) + (const :tag "don't set" nil))) ;;;###autoload (defun magit-clone (repository directory) @@ -60,17 +60,17 @@ Then show the status buffer for the new repository." ;; Stop cygwin git making a "c:" directory. (magit-convert-git-filename directory)) 0) - (when (or (eq magit-clone-set-branch.pushDefault t) - (and magit-clone-set-branch.pushDefault - (y-or-n-p "Set `branch.pushDefault' to \"origin\"? "))) - (magit-call-git "config" "branch.pushDefault" "origin")) + (when (or (eq magit-clone-set-remote.pushDefault t) + (and magit-clone-set-remote.pushDefault + (y-or-n-p "Set `remote.pushDefault' to \"origin\"? "))) + (magit-call-git "config" "remote.pushDefault" "origin")) (message "Cloning %s...done" repository) (magit-status-internal directory))) ;;; Setup -(defcustom magit-remote-add-set-branch.pushDefault 'ask-if-unset - "Whether to set the value of `branch.pushDefault' after adding a remote. +(defcustom magit-remote-add-set-remote.pushDefault 'ask-if-unset + "Whether to set the value of `remote.pushDefault' after adding a remote. If `ask', then always ask. If `ask-if-unset', then ask, but only if the variable isn't set already. If nil, then don't ever set. @@ -79,10 +79,10 @@ name of the name of the added remote is equal to that string and the variable isn't already set." :package-version '(magit . "2.4.0") :group 'magit-commands - :type '(choice (const "ask if unset" ask-if-unset) - (const "always ask" ask) - (string "set if named") - (const "don't set"))) + :type '(choice (const :tag "ask if unset" ask-if-unset) + (const :tag "always ask" ask) + (string :tag "set if named") + (const :tag "don't set"))) ;;;###autoload (autoload 'magit-remote-popup "magit-remote" nil t) (magit-define-popup magit-remote-popup @@ -105,13 +105,13 @@ the variable isn't already set." "Add a remote named REMOTE and fetch it." (interactive (list (magit-read-string-ns "Remote name") (magit-read-url "Remote url"))) - (if (pcase (list magit-remote-add-set-branch.pushDefault - (magit-get "branch.defaultPush")) + (if (pcase (list magit-remote-add-set-remote.pushDefault + (magit-get "remote.defaultPush")) (`(,(pred stringp) ,_) t) ((or `(ask ,_) `(ask-if-unset nil)) - (y-or-n-p (format "Set `branch.pushDefault' to \"%s\"? " remote)))) + (y-or-n-p (format "Set `remote.pushDefault' to \"%s\"? " remote)))) (progn (magit-call-git "remote" "add" "-f" remote url) - (magit-call-git "config" "branch.pushDefault" remote) + (magit-call-git "config" "remote.pushDefault" remote) (magit-refresh)) (magit-run-git-async "remote" "add" "-f" remote url))) @@ -436,9 +436,12 @@ upstream can be changed before pushed to it." (interactive (list (magit-push-arguments) (and (magit--push-current-set-upstream-p current-prefix-arg) - (magit-read-remote-branch - (format "Set upstream of %s and push there" - (magit-get-current-branch)))))) + (let ((branch (magit-get-current-branch))) + (magit-read-other-branch + (format "Set upstream of %s and push there" branch) + nil (or (magit-branch-p "origin/master") + (and (not (equal branch "master")) + (magit-branch-p "master")))))))) (--if-let (magit-get-current-branch) (progn (when upstream @@ -527,7 +530,7 @@ branch as default." This command simply runs \"git push -v [ARGS]\". ARGS are the arguments specified in the popup buffer. No explicit refspec arguments are used. Instead the behavior depends on at least -these Git variables: `push.default', `branch.pushDefault', +these Git variables: `push.default', `remote.pushDefault', `branch..pushRemote', `branch..remote', `branch..merge', and `remote..push'. @@ -580,7 +583,7 @@ The REMOTE is read in the minibuffer. This command simply runs \"git push -v [ARGS] REMOTE\". ARGS are the arguments specified in the popup buffer. No refspec arguments are used. Instead the behavior depends on at least -these Git variables: `push.default', `branch.pushDefault', +these Git variables: `push.default', `remote.pushDefault', `branch..pushRemote', `branch..remote', `branch..merge', and `remote..push'. diff --git a/elpa/magit-20151223.1425/magit-section.el b/elpa/magit-20160102.906/magit-section.el similarity index 97% rename from elpa/magit-20151223.1425/magit-section.el rename to elpa/magit-20160102.906/magit-section.el index bb894f99..596a6fcf 100644 --- a/elpa/magit-20151223.1425/magit-section.el +++ b/elpa/magit-20160102.906/magit-section.el @@ -1,6 +1,6 @@ ;;; magit-section.el --- section functionality -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -941,6 +941,10 @@ invisible." (put 'magit-section-visibility-cache 'permanent-local t) (defun magit-section-set-visibility-from-cache (section) + "Set SECTION's visibility to the cached value. +Currently the cache can only be used to remember that a section's +body should be collapsed, not that it should be expanded. Return +either `hide' or nil." (and (member (magit-section-visibility-ident section) magit-section-visibility-cache) 'hide)) @@ -1084,10 +1088,13 @@ Add FUNCTION at the beginning of the hook list unless optional APPEND is non-nil, in which case FUNCTION is added at the end. If FUNCTION already is a member then move it to the new location. -If optional AT is non-nil and a member of the hook list, then add -FUNCTION next to that instead. Add before or after AT depending -on APPEND. If only FUNCTION is a member of the list, then leave -it where ever it already is. +If optional AT is non-nil and a member of the hook list, then +add FUNCTION next to that instead. Add before or after AT, or +replace AT with FUNCTION depending on APPEND. If APPEND is the +symbol `replace', then replace AT with FUNCTION. For any other +non-nil value place FUNCTION right after AT. If nil, then place +FUNCTION right before AT. If FUNCTION already is a member of the +list but AT is not, then leave FUNCTION where ever it already is. If optional LOCAL is non-nil, then modify the hook's buffer-local value rather than its global value. This makes the hook local by @@ -1113,15 +1120,20 @@ again use `remove-hook'." (if at (when (setq at (member at value)) (setq value (delq function value)) - (if append - (push function (cdr at)) - (push (car at) (cdr at)) - (setcar at function))) + (cond ((eq append 'replace) + (setcar at function)) + (append + (push function (cdr at))) + (t + (push (car at) (cdr at)) + (setcar at function)))) (setq value (delq function value))) (unless (member function value) (setq value (if append (append value (list function)) (cons function value)))) + (when (eq append 'replace) + (setq value (delq at value))) (if local (set hook value) (set-default hook value)))) diff --git a/elpa/magit-20151223.1425/magit-sequence.el b/elpa/magit-20160102.906/magit-sequence.el similarity index 99% rename from elpa/magit-20151223.1425/magit-sequence.el rename to elpa/magit-20160102.906/magit-sequence.el index 14e56893..c7ace58f 100644 --- a/elpa/magit-20151223.1425/magit-sequence.el +++ b/elpa/magit-20160102.906/magit-sequence.el @@ -1,6 +1,6 @@ ;;; magit-sequence.el --- history manipulation in Magit -*- lexical-binding: t -*- -;; Copyright (C) 2011-2015 The Magit Project Contributors +;; Copyright (C) 2011-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20151223.1425/magit-stash.el b/elpa/magit-20160102.906/magit-stash.el similarity index 99% rename from elpa/magit-20151223.1425/magit-stash.el rename to elpa/magit-20160102.906/magit-stash.el index c46679b7..de23833f 100644 --- a/elpa/magit-20151223.1425/magit-stash.el +++ b/elpa/magit-20160102.906/magit-stash.el @@ -1,6 +1,6 @@ ;;; magit-stash.el --- stash support for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2008-2015 The Magit Project Contributors +;; Copyright (C) 2008-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20151223.1425/magit-utils.el b/elpa/magit-20160102.906/magit-utils.el similarity index 99% rename from elpa/magit-20151223.1425/magit-utils.el rename to elpa/magit-20160102.906/magit-utils.el index 8b2b535e..24333938 100644 --- a/elpa/magit-20151223.1425/magit-utils.el +++ b/elpa/magit-20160102.906/magit-utils.el @@ -1,6 +1,6 @@ ;;; magit-utils.el --- various utilities -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20151223.1425/magit-wip.el b/elpa/magit-20160102.906/magit-wip.el similarity index 99% rename from elpa/magit-20151223.1425/magit-wip.el rename to elpa/magit-20160102.906/magit-wip.el index 9255dce2..e8963830 100644 --- a/elpa/magit-20151223.1425/magit-wip.el +++ b/elpa/magit-20160102.906/magit-wip.el @@ -1,6 +1,6 @@ ;;; magit-wip.el --- commit snapshots to work-in-progress refs -*- lexical-binding: t -*- -;; Copyright (C) 2010-2015 The Magit Project Contributors +;; Copyright (C) 2010-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20151223.1425/magit.el b/elpa/magit-20160102.906/magit.el similarity index 99% rename from elpa/magit-20151223.1425/magit.el rename to elpa/magit-20160102.906/magit.el index da157fe8..06ace1a7 100644 --- a/elpa/magit-20151223.1425/magit.el +++ b/elpa/magit-20160102.906/magit.el @@ -1,6 +1,6 @@ ;;; magit.el --- A Git porcelain inside Emacs -*- lexical-binding: t -*- -;; Copyright (C) 2008-2015 The Magit Project Contributors +;; Copyright (C) 2008-2016 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -1551,10 +1551,11 @@ is the full reference of the upstream branch, on the remote." (magit-get-current-branch)) (magit-read-local-branch "Change upstream of branch")))) (list branch (and (not (magit-get-upstream-branch branch)) - (magit-completing-read + (magit-read-other-branch (format "Change upstream of %s to" branch) - (delete branch (magit-list-branch-names)) - nil nil nil 'magit-revision-history))))) + nil (or (magit-branch-p "origin/master") + (and (not (equal branch "master")) + (magit-branch-p "master")))))))) (if upstream (magit-run-git-no-revert "branch" (concat "--set-upstream-to=" upstream) branch) @@ -2648,7 +2649,7 @@ expansion of EOB-FORMAT is inserted at the end of the buffer (if the buffer ends with a comment, then it is inserted right before that)." :package-version '(magit . "2.3.0") - :group 'magit-status + :group 'magit-commands :type '(list (choice (string :tag "Insert at point format") (cons (string :tag "Insert at point format") (repeat (string :tag "Argument to git show"))) diff --git a/elpa/magit-20160102.906/magit.info b/elpa/magit-20160102.906/magit.info new file mode 100644 index 00000000..447b8769 --- /dev/null +++ b/elpa/magit-20160102.906/magit.info @@ -0,0 +1,158 @@ +This is magit.info, produced by makeinfo version 5.2 from magit.texi. + +Magit is an interface to the version control system Git, implemented as +an Emacs package. Magit aspires to be a complete Git porcelain. While +we cannot (yet) claim that Magit wraps and improves upon each and every +Git command, it is complete enough to allow even experienced Git users +to perform almost all of their daily version control tasks directly from +within Emacs. While many fine Git clients exist, only Magit and Git +itself deserve to be called porcelains. + + Copyright (C) 2015-2016 Jonas Bernoulli + + You can redistribute this document and/or modify it under the terms + of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) + any later version. + + This document is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. +INFO-DIR-SECTION Emacs +START-INFO-DIR-ENTRY +* Magit: (magit). Using Git from Emacs with Magit. +END-INFO-DIR-ENTRY + + +Indirect: +magit.info-1: 1222 +magit.info-2: 306730 + +Tag Table: +(Indirect) +Node: Top1222 +Node: Introduction5680 +Node: Installation10373 +Node: Updating from an older release10748 +Node: Installing from an Elpa archive12343 +Node: Installing from the Git repository13901 +Node: Post-installation tasks16138 +Node: Getting started17664 +Node: Interface concepts23399 +Node: Modes and Buffers23725 +Node: Switching Buffers25340 +Node: Naming Buffers28404 +Node: Quitting Windows31239 +Node: Automatic save32825 +Node: Automatic refresh and revert33890 +Node: Sections39152 +Node: Section movement40104 +Node: Section visibility44031 +Node: Section hooks47622 +Node: Section types and values49660 +Node: Section options50930 +Node: Popup buffers and prefix commands51402 +Node: Completion and confirmation52716 +Node: Running Git55622 +Node: Viewing Git output55858 +Node: Running Git manually56858 +Node: Git executable58984 +Node: Global Git arguments60991 +Node: Inspecting61798 +Node: Status buffer62925 +Node: Status sections65448 +Node: Status header sections70195 +Node: Status options72754 +Node: Logging73478 +Node: Refreshing logs75845 +Node: Log Buffer77230 +Node: Select from log80319 +Node: Reflog81259 +Node: Diffing81737 +Node: Refreshing diffs84549 +Node: Diff buffer87530 +Node: Diff options89432 +Node: Revision buffer91064 +Node: Ediffing92019 +Node: References buffer95068 +Node: References sections99778 +Node: Bisecting100653 +Node: Visiting blobs102149 +Node: Blaming102658 +Node: Manipulating105978 +Node: Repository setup106270 +Node: Staging and unstaging107310 +Node: Staging from file-visiting buffers109659 +Node: Applying110827 +Node: Committing112470 +Node: Initiating a commit113053 +Node: Editing commit messages116365 +Node: Branching126761 +Node: Merging139048 +Node: Rebasing141132 +Node: Editing rebase sequences144080 +Node: Rebase sequence log147114 +Node: Cherry picking153858 +Node: Reverting155464 +Node: Resetting156827 +Node: Stashing158337 +Node: Transferring161482 +Node: Remotes161720 +Node: Fetching163006 +Node: Pulling163983 +Node: Pushing164709 +Node: Creating and sending patches169038 +Node: Applying patches169733 +Node: Miscellaneous170731 +Node: Tagging171022 +Node: Notes171807 +Node: Submodules174332 +Node: Common commands175652 +Node: Wip modes177400 +Node: Minor mode for buffers visiting files184136 +Node: Minor mode for buffers visiting blobs186279 +Node: Customizing187084 +Node: Per-repository configuration188756 +Node: Essential settings190390 +Node: Safety190714 +Node: Performance193948 +Node: Plumbing200594 +Node: Calling Git201222 +Node: Getting a value from Git202745 +Node: Calling Git for effect205849 +Node: Section plumbing212353 +Node: Creating sections212581 +Node: Section selection216384 +Node: Matching sections218064 +Node: Refreshing buffers223266 +Node: Conventions226401 +Node: Confirmation and completion226578 +Node: Theming Faces227476 +Node: FAQ235627 +Node: Magit is slow236797 +Node: I changed several thousand files at once and now Magit is unusable236998 +Node: I am having problems committing237714 +Node: I don't like how branching and pushing works238167 +Node: I cannot install the pre-requisites for Magit v2238647 +Node: I am using an Emacs release older than v244239121 +Node: I am using a Git release older than v194240734 +Node: I am using MS Windows and cannot push with Magit241721 +Node: How to install the gitman info manual?242300 +Node: How can I show Git's output?244826 +Node: Expanding a file to show the diff causes it to disappear245638 +Node: Point is wrong in the COMMIT_EDITMSG buffer246164 +Node: Can Magit be used as ediff-version-control-package?247182 +Node: How to show diffs for gpg-encrypted files?249206 +Node: Emacs 245 hangs when loading Magit249797 +Node: Keystroke Index250316 +Node: Command Index277507 +Node: Function Index306730 +Node: Variable Index318344 + +End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/elpa/magit-20151223.1425/magit.info-1 b/elpa/magit-20160102.906/magit.info-1 similarity index 99% rename from elpa/magit-20151223.1425/magit.info-1 rename to elpa/magit-20160102.906/magit.info-1 index c9e4ab84..cddf7923 100644 --- a/elpa/magit-20151223.1425/magit.info-1 +++ b/elpa/magit-20160102.906/magit.info-1 @@ -8,7 +8,7 @@ to perform almost all of their daily version control tasks directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. - Copyright (C) 2015 Jonas Bernoulli + Copyright (C) 2015-2016 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -38,7 +38,7 @@ to perform almost all of their daily version control tasks directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. - Copyright (C) 2015 Jonas Bernoulli + Copyright (C) 2015-2016 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -971,6 +971,16 @@ undesirable. input arrives, then stop reverting. After (the absolute value of) NUMBER seconds resume reverting. + -- User Option: magit-revert-buffers-only-for-tracked-files + + This option controls whether only buffers that visit tracked files + + If non-nil, then only tracked files may be reverted. If nil, then + all files in the current repository may potentially be reverted. + Reverting untracked files should be safe and limiting to only + tracked files has the potential of causing very noticable delays, + so the default is to revert all buffers. + Buffers can also be refreshed explicitly, which is useful in buffers that weren’t current during the last refresh and after changes were made to the repository outside of Magit. @@ -2945,9 +2955,9 @@ File: magit.info, Node: Repository setup, Next: Staging and unstaging, Up: Ma The user is queried for a remote url and a local directory. - -- User Option: magit-clone-set-branch.pushDefault + -- User Option: magit-clone-set-remote.pushDefault - Whether to set the value of ‘branch.pushDefault’ after cloning. + Whether to set the value of ‘remote.pushDefault’ after cloning. If ‘t’, then set without asking. If ‘nil’, then don’t set. If ‘ask’, then ask the user every time she clones a repository. @@ -4414,9 +4424,9 @@ Also see *note (gitman)git-remote:: . Delete a remote, read from the minibuffer. - -- User Option: magit-remote-add-set-branch.pushDefault + -- User Option: magit-remote-add-set-remote.pushDefault - Whether to set the value of ‘branch.pushDefault’ after adding a + Whether to set the value of ‘remote.pushDefault’ after adding a remote. If ‘ask’, then always ask. If ‘ask-if-unset’, then ask, but only @@ -4560,7 +4570,7 @@ them to the popup. This command simply runs ‘git push -v [ARGS]’. ARGS are the arguments specified in the popup buffer. No explicit refspec arguments are used. Instead the behavior depends on at least these - Git variables: ‘push.default’, ‘branch.pushDefault’, + Git variables: ‘push.default’, ‘remote.pushDefault’, ‘branch..pushRemote’, ‘branch..remote’, ‘branch..merge’, and ‘remote..push’. @@ -4572,7 +4582,7 @@ them to the popup. This command simply runs ‘git push -v [ARGS] REMOTE’. ARGS are the arguments specified in the popup buffer. No refspec arguments are used. Instead the behavior depends on at least these Git - variables: ‘push.default’, ‘branch.pushDefault’, + variables: ‘push.default’, ‘remote.pushDefault’, ‘branch..pushRemote’, ‘branch..remote’, ‘branch..merge’, and ‘remote..push’. @@ -6687,9 +6697,9 @@ Appendix B Keystroke Index * f u: Fetching. (line 17) * F u: Pulling. (line 17) * g: Automatic refresh and revert. - (line 68) + (line 78) * G: Automatic refresh and revert. - (line 77) + (line 87) * j: Diff buffer. (line 38) * k: Viewing Git output. (line 19) * k <1>: Applying. (line 37) @@ -7156,9 +7166,9 @@ Appendix C Command Index * magit-reflog-head: Reflog. (line 19) * magit-reflog-other: Reflog. (line 15) * magit-refresh: Automatic refresh and revert. - (line 68) + (line 78) * magit-refresh-all: Automatic refresh and revert. - (line 77) + (line 87) * magit-remote-add: Remotes. (line 13) * magit-remote-popup: Remotes. (line 8) * magit-remote-remove: Remotes. (line 28) diff --git a/elpa/magit-20151223.1425/magit.info-2 b/elpa/magit-20160102.906/magit.info-2 similarity index 98% rename from elpa/magit-20151223.1425/magit.info-2 rename to elpa/magit-20160102.906/magit.info-2 index b53236baaeb53a6db51190daf7ea65e36f5df9ee..eaea9be81d9c5c9dc1f34d47faf6677838d2ec28 100644 GIT binary patch delta 118 zcmcbyjPdhw#tkM+thz=9hGv^hm}aswT5dka`O#pqeh|;*(^f%DlLdmsH=Ec_;$Sq| zeBAXo6O*CA<_R82AaRk+Y~J3C%Be*qx=E#JX{klUy7_rImAYy9MY<(LiOJciDY|Ky WIjO}~lka(_OwM%T+3e@T#SQ>*Unu|p delta 75 zcmeyoobkpo#tkM+n=P4UvNKw2zRda2fYD&{QL9)cwxpuOyyT3{8n%l$CZ7u8*?iq~ a57T5GYu?QZJi_6!f4w3ZH^1>=X9oaM<{Z@k -- 2.47.3