Mercurial > emacs
changeset 107965:97f3e0bea122
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 16 Apr 2010 03:22:06 +0000 |
| parents | c269d35fafb2 (current diff) 586e0975d697 (diff) |
| children | 418153f9c105 |
| files | |
| diffstat | 5 files changed, 30 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Thu Apr 15 22:43:50 2010 +0000 +++ b/doc/emacs/ChangeLog Fri Apr 16 03:22:06 2010 +0000 @@ -1,3 +1,7 @@ +2010-04-16 Glenn Morris <rgm@gnu.org> + + * maintaining.texi (VC Directory Commands): Mention stashes and shelves. + 2010-04-15 Glenn Morris <rgm@gnu.org> * dired.texi (Misc Dired Features): Mention VC diff and log.
--- a/doc/emacs/maintaining.texi Thu Apr 15 22:43:50 2010 +0000 +++ b/doc/emacs/maintaining.texi Fri Apr 16 03:22:06 2010 +0000 @@ -1147,9 +1147,14 @@ @kbd{M-s a C-M-s} does an incremental search on the marked files. - Commands are also accessible from the VC-dir menu. Note that some VC -backends use the VC-dir menu to make available extra backend specific -commands. +@cindex stashes in version control +@cindex shelves in version control + Commands are also accessible from the VC-dir menu. Note that some +VC backends use the VC-dir menu to make available extra, +backend-specific, commands. For example, Git and Bazaar allow you to +manipulate @dfn{stashes} and @dfn{shelves}. (These provide a +mechanism to temporarily store uncommitted changes somewhere out of +the way, and bring them back at a later time.) Normal VC commands with the @kbd{C-x v} prefix work in VC directory buffers. Some single-key shortcuts are available as well; @kbd{=},
--- a/etc/NEWS Thu Apr 15 22:43:50 2010 +0000 +++ b/etc/NEWS Fri Apr 16 03:22:06 2010 +0000 @@ -338,15 +338,20 @@ *** vc-git changes -**** The short log format for git makes use of the graph display, so -it's not supported on git versions earlier than 1.5. - +--- +**** The short log format for git makes use of the graph display, +so it's not supported on git versions earlier than 1.5.6. + +--- +**** vc-dir uses the --relative option of git, and so requires at least +git version 1.5.5. + ++++ **** Support for operating with stashes has been added to vc-dir: the stash list is displayed in the *vc-dir* header, stashes can be created, removed, applied and their content displayed. -**** vc-dir requires at least git-1.5.5. - ++++ *** vc-bzr supports operating with shelves: the shelve list is displayed in the *vc-dir* header, shelves can be created, removed and applied. ---
--- a/lisp/ChangeLog Thu Apr 15 22:43:50 2010 +0000 +++ b/lisp/ChangeLog Fri Apr 16 03:22:06 2010 +0000 @@ -1,3 +1,7 @@ +2010-04-16 Glenn Morris <rgm@gnu.org> + + * vc-git.el (vc-git-print-log): Doc fix. + 2010-04-14 Óscar Fuentes <ofv@wanadoo.es> * ido.el (ido-file-internal): Fix 2009-12-02 change.
--- a/lisp/vc-git.el Thu Apr 15 22:43:50 2010 +0000 +++ b/lisp/vc-git.el Fri Apr 16 03:22:06 2010 +0000 @@ -413,6 +413,7 @@ (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o" "-i" "--directory" "--no-empty-directory" "--exclude-standard" "--")) + ;; --relative added in Git 1.5.5. (diff-index (vc-git-command (current-buffer) 'async files "diff-index" "--relative" "-z" "-M" "HEAD" "--"))) @@ -571,7 +572,9 @@ ;;; HISTORY FUNCTIONS (defun vc-git-print-log (files buffer &optional shortlog start-revision limit) - "Get change log associated with FILES." + "Get change log associated with FILES. +Note that using SHORTLOG requires at least Git version 1.5.6, +for the --graph option." (let ((coding-system-for-read git-commits-coding-system)) ;; `vc-do-command' creates the buffer, but we need it before running ;; the command.