Permalink
Browse files

Merge commit '9d1e3e209f62c0f7aaa1790b12320393722f042d' into tarsius/…

…strings
  • Loading branch information...
2 parents 12441d6 + 9d1e3e2 commit 73c72d793928b0b01ee81151764f151322d7a0c8 @sigma sigma committed Apr 4, 2013
Showing with 151 additions and 100 deletions.
  1. +33 −9 magit-bisect.el
  2. +5 −5 magit-blame.el
  3. +3 −3 magit-flow.el
  4. +34 −8 magit-key-mode.el
  5. +2 −3 magit-stgit.el
  6. +4 −3 magit-svn.el
  7. +3 −2 magit-topgit.el
  8. +11 −9 magit-wip.el
  9. +41 −42 magit.el
  10. +15 −16 rebase-mode.el
View
@@ -1,3 +1,26 @@
+;;; magit-bisect.el --- bisect support for Magit
+
+;; Copyright (C) 2011 Moritz Bunkus
+
+;; Magit is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; Magit 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.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Magit. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Control git-bisect from Magit.
+
+;;; Code:
+
(require 'magit)
(defvar magit--bisect-last-pos)
@@ -21,7 +44,7 @@ match REQUIRED-STATUS."
(list :status (if (magit--bisecting-p) 'running 'not-running)))))
(defun magit--bisect-cmd (&rest args)
- "Run `git bisect ...' and update the status buffer"
+ "Run `git bisect ...' and update the status buffer."
(with-current-buffer (magit-find-status-buffer)
(let* ((output (apply 'magit-git-lines (append '("bisect") args)))
(cmd (car args))
@@ -44,7 +67,7 @@ match REQUIRED-STATUS."
(magit-refresh))
(defun magit--bisect-info-for-status (branch)
- "Return bisect info suitable for display in the status buffer"
+ "Return bisect info suitable for display in the status buffer."
(let* ((info (magit--bisect-info))
(status (plist-get info :status)))
(cond ((eq status 'not-running)
@@ -59,7 +82,7 @@ match REQUIRED-STATUS."
"(bisecting; unknown error occured)"))))
(defun magit-bisect-start ()
- "Start a bisect session"
+ "Start a bisect session."
(interactive)
(if (magit--bisecting-p)
(error "Already bisecting"))
@@ -68,21 +91,21 @@ match REQUIRED-STATUS."
(magit--bisect-cmd "start" bad good)))
(defun magit-bisect-reset ()
- "Quit a bisect session"
+ "Quit a bisect session."
(interactive)
(unless (magit--bisecting-p)
(error "Not bisecting"))
(magit--bisect-cmd "reset"))
(defun magit-bisect-good ()
- "Tell git that the current revision is good during a bisect session"
+ "Tell git that the current revision is good during a bisect session."
(interactive)
(unless (magit--bisecting-p 'running)
(error "Not bisecting"))
(magit--bisect-cmd "good"))
(defun magit-bisect-bad ()
- "Tell git that the current revision is bad during a bisect session"
+ "Tell git that the current revision is bad during a bisect session."
(interactive)
(unless (magit--bisecting-p 'running)
(error "Not bisecting"))
@@ -96,15 +119,15 @@ match REQUIRED-STATUS."
(magit--bisect-cmd "skip"))
(defun magit-bisect-log ()
- "Show the bisect log"
+ "Show the bisect log."
(interactive)
(unless (magit--bisecting-p)
(error "Not bisecting"))
(magit-run-git "bisect" "log")
(magit-display-process))
(defun magit-bisect-visualize ()
- "Show the remaining suspects with gitk"
+ "Show the remaining suspects with gitk."
(interactive)
(unless (magit--bisecting-p)
(error "Not bisecting"))
@@ -121,7 +144,7 @@ match REQUIRED-STATUS."
"Previously run bisect commands.")
(defun magit-bisect-run (command)
- "Bisect automatically by running commands after each step"
+ "Bisect automatically by running commands after each step."
(interactive
(list
(read-from-minibuffer "Run command (like this): "
@@ -193,3 +216,4 @@ match REQUIRED-STATUS."
(abbreviate-file-name default-directory)))))))))
(provide 'magit-bisect)
+;;; magit-bisect.el ends here
View
@@ -1,4 +1,4 @@
-;;; magit-blame.el --- blame support for magit
+;;; magit-blame.el --- blame support for Magit
;; Copyright (C) 2012 Rüdiger Sonderfeld
;; Copyright (C) 2012 Yann Hodique
@@ -9,7 +9,6 @@
;; Copyright (C) 2008 Marius Vollmer
;; Author: Yann Hodique <yann.hodique@gmail.com>
-;; Keywords:
;; Magit is free software; you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by
@@ -26,7 +25,8 @@
;;; Commentary:
-;; This code has been backported from Egg (Magit fork) to Magit
+;; Control git-blame from Magit.
+;; This code has been backported from Egg (Magit fork) to Magit.
;;; Code:
@@ -186,8 +186,8 @@ boundaries from BEG to END, the return value is nil."
The second argument TZ can be used to add the timezone in (-)HHMM
format to UNIXTIME. UNIXTIME should be either a number
-containing seconds since epoch or Emacs's (HIGH LOW
-. IGNORED) format."
+containing seconds since epoch or Emacs's (HIGH LOW . IGNORED)
+format."
(when (numberp tz)
(unless (numberp unixtime)
(setq unixtime (float-time unixtime)))
View
@@ -1,7 +1,7 @@
;;; magit-flow.el --- git-flow plug-in for Magit
;; Copyright (C) 2012 Phil Jackson
-;;
+
;; Magit is free software; you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 3, or (at your option)
@@ -18,7 +18,7 @@
;;; Commentary:
;; This plug-in provides git-flow functionality as a separate
-;; component of Magit. Only supports `feature` commands at the moment.
+;; component of Magit. Only supports `feature' commands at the moment.
;;; Code:
@@ -43,7 +43,7 @@
(magit-run-git-flow "feature" "start" name)))
(defun magit-flow-feature-list ()
- "List the feature branches managed by flow"
+ "List the feature branches managed by flow."
(let ((current-feature nil)
(all-features nil))
(dolist (name (magit-run-git-lines-flow "feature" "list"))
View
@@ -1,10 +1,36 @@
+;;; magit-key-mode.el --- interactively tune git invocation
+
+;; Copyright (C) 2010 Phil Jackson
+
+;; Magit is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; Magit 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.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Magit. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This library implements `magit-key-mode' which is used throughout
+;; Magit to let the user interactively select the command, switches
+;; and options to call Git with. It can be though of as a way to
+;; provide "postfix" arguments.
+
+;;; Code:
+
(require 'magit)
(eval-when-compile (require 'cl-lib))
(defvar magit-key-mode-key-maps '()
"This will be filled lazily with proper `define-key' built
- keymaps as they're requested.")
+keymaps as they're requested.")
(defvar magit-key-mode-buf-name "*magit-key: %s*"
"Format string to create the name of the magit-key buffer.")
@@ -14,11 +40,11 @@
(defvar magit-key-mode-current-args nil
"A hash-table of current argument set (which will eventually
- make it to the git command-line).")
+make it to the git command-line).")
(defvar magit-key-mode-current-options '()
"Current option set (which will eventually make it to the git
- command-line).")
+command-line).")
(defvar magit-log-mode-window-conf nil
"Will hold the pre-menu configuration of magit.")
@@ -438,8 +464,7 @@ the key combination highlighted before the description."
(insert (propertize header 'face 'font-lock-keyword-face) "\n"))
(defvar magit-key-mode-args-in-cols nil
- "When true, draw arguments in columns as with switches and
- options.")
+ "When true, draw arguments in columns as with switches and options.")
(defun magit-key-mode-draw-args (args)
"Draw the args part of the menu."
@@ -484,9 +509,9 @@ the key combination highlighted before the description."
one-col-each)))
(defun magit-key-mode-draw-in-cols (strings one-col-each)
- "Given a list of strings, print in columns (using `insert'). If
-ONE-COL-EACH is true then don't columify, but rather, draw each
-item on one line."
+ "Given a list of strings, print in columns (using `insert').
+If ONE-COL-EACH is true then don't columify, but rather, draw
+each item on one line."
(let ((longest-act (apply 'max (mapcar 'length strings))))
(while strings
(let ((str (car strings)))
@@ -539,3 +564,4 @@ Return the point before the actions part, if any, nil otherwise."
magit-key-mode-groups)
(provide 'magit-key-mode)
+;;; magit-key-mode.el ends here
View
@@ -1,7 +1,7 @@
;;; magit-stgit.el --- StGit plug-in for Magit
;; Copyright (C) 2011 Lluis Vilanova
-;;
+
;; Magit is free software; you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 3, or (at your option)
@@ -235,8 +235,7 @@
(defun magit-stgit-refresh ()
"Refresh the contents of a patch in an StGit series.
If there is no marked patch in the series, refreshes the current
-patch.
-Otherwise, refreshes the marked patch."
+patch. Otherwise, refreshes the marked patch."
(interactive)
(if magit-stgit--marked-patch
(magit-run magit-stgit-executable "refresh" "-p" magit-stgit--marked-patch)
View
@@ -8,7 +8,7 @@
;; Copyright (C) 2008 Marcin Bachry
;; Copyright (C) 2008, 2009 Marius Vollmer
;; Copyright (C) 2010 Yann Hodique
-;;
+
;; Magit is free software; you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 3, or (at your option)
@@ -24,7 +24,8 @@
;;; Commentary:
-;; This plug-in provides git-svn functionality as a separate component of Magit
+;; This plug-in provides git-svn functionality as a separate component
+;; of Magit.
;;; Code:
@@ -210,7 +211,7 @@ If USE-CACHE is non nil, use the cached information."
(magit-refresh))))
(defun magit-svn-external-directories()
- "Returns all .git directories within `magit-svn-externals-dir'"
+ "Returns all .git directories within `magit-svn-externals-dir'."
(require 'find-lisp)
(find-lisp-find-files-internal (expand-file-name magit-svn-externals-dir)
'(lambda(file dir)
View
@@ -2,7 +2,7 @@
;; Copyright (C) 2010 Nathan Weizenbaum
;; Copyright (C) 2010 Yann Hodique
-;;
+
;; Magit is free software; you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 3, or (at your option)
@@ -18,7 +18,8 @@
;;; Commentary:
-;; This plug-in provides topgit functionality as a separate component of Magit
+;; This plug-in provides topgit functionality as a separate component
+;; of Magit.
;;; Code:
View
@@ -86,19 +86,21 @@
"Commit message for git-wip commits.
The following `format'-like specs are supported:
-%f the full name of the file being saved, and
-%r the name of the file being saved, relative to the repository root
-%g the root of the git repository."
+%f the full name of the file being saved
+#g the root of the git repository
+%r the name of the file being saved,
+ relative to the repository root."
:group 'magit
:type 'string)
(defcustom magit-wip-echo-area-message "Wrote %f (wip)"
"Message shown in the echo area after creating a git-wip commit.
The following `format'-like specs are supported:
-%f the full name of the file being saved, and
-%r the name of the file being saved, relative to the repository root.
-%g the root of the git repository."
+%f the full name of the file being saved
+#g the root of the git repository
+%r the name of the file being saved,
+ relative to the repository root."
:group 'magit
:type '(choice (const :tag "No message" nil) string))
@@ -108,9 +110,9 @@ The following `format'-like specs are supported:
(define-minor-mode magit-wip-save-mode
"Magit support for committing to a work-in-progress ref.
-When this minor mode is turned on and a file is saved inside a writable
-git repository then it is also committed to a special work-in-progress
-ref."
+When this minor mode is turned on and a file is saved inside a
+writable git repository then it is also committed to a special
+work-in-progress ref."
:lighter magit-wip-save-mode-lighter
(if magit-wip-save-mode
(add-hook 'after-save-hook 'magit-wip-save t t)
Oops, something went wrong.

0 comments on commit 73c72d7

Please sign in to comment.