11 commits

Author	SHA1	Message	Date
Glenn Morris	02da65ff3a	Add `vc-git-program' option; suggested on emacs-devel. ... * lisp/vc/vc-git.el (vc-git-program): New option. (vc-git-branches, vc-git-pull, vc-git-merge-branch, vc-git-command) (vc-git--call): Use it.	2011-03-10 00:26:41 -08:00
Chong Yidong	33f6cf7b4c	Add Log View toggle and log format customization for Git and Hg. ... * lisp/vc/vc-git.el (vc-git-root-log-format): New option for customizing log format. (vc-git-print-log, vc-git-log-outgoing, vc-git-log-incoming) (vc-git-log-view-mode): Use it. (vc-git-expanded-log-entry): New function. (vc-git-log-view-mode): Use it. Truncate lines in root log. * lisp/vc/vc-hg.el (vc-hg-root-log-template): New option for customizing log format. (vc-hg-print-log): Use it. (vc-hg-expanded-log-entry): New function. (vc-hg-log-view-mode): Use vc-hg-root-log-template and vc-hg-expanded-log-entry. Truncate lines in root log. * lisp/vc/vc-bzr.el (vc-bzr-log-view-mode): Truncate lines in root log. * lisp/vc/log-view.el (log-view-mode-menu): Add log-view-toggle-entry-display.	2011-02-13 20:49:24 -05:00
Chong Yidong	a2b6e5d60b	Refresh Dired and VC-dir buffers after vc-pull and vc-merge. ... * vc/vc-dispatcher.el (vc-set-async-update): New function for updating Dired or VC-dir buffers after async command completes. * vc/vc-bzr.el (vc-bzr-async-command): Return the process buffer. (vc-bzr-pull, vc-bzr-merge-branch): Use vc-set-async-update. * vc/vc-git.el (vc-git-merge-branch): Add FETCH_HEAD to branch completions if it exists. Use vc-set-async-update. (vc-git-pull): Use vc-set-async-update. * vc/vc-hg.el (vc-hg-pull): Fix default-contents arg to read-shell-command. Use vc-set-async-update. (vc-hg-merge-branch): Use vc-set-async-update.	2011-01-29 16:19:21 -05:00
Chong Yidong	659114fdba	Rudimentary support for vc-pull and vc-merge in Git and Mercurial. ... * lisp/vc/vc.el (vc-pull): Make vc-update an alias for this, instead of the other way around. * lisp/vc/vc-git.el (vc-git-branches, vc-git-pull) (vc-git-merge-branch): New functions. (vc-git-history): New var. * lisp/vc/vc-hg.el (vc-hg-history): New var. (vc-hg-pull): Perform default pull if called via Lisp by vc-pull. (vc-hg-merge-branch): New function.	2011-01-28 22:12:32 -05:00
Glenn Morris	73b0cd5003	Convert consecutive FSF copyright years to ranges.	2011-01-24 20:08:28 -08:00
Glenn Morris	0d9f702fd0	Nuke arch-tags.	2011-01-15 15:16:57 -08:00
Stefan Monnier	77ab81d054	Merge from emacs-23	2011-01-14 12:18:41 -05:00
Chong Yidong	bd78fa1d54	Add "Package:" file headers to denote built-in packages.	2010-08-29 12:17:13 -04:00
Chong Yidong	2ec1b5ee34	Merge changes from emacs-23 branch.	2010-07-10 14:52:53 -04:00
Juri Linkov	9766adfbca	* lisp/finder.el (finder-known-keywords): Add keyword "vc" ... for version control. * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el, * emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el, * vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el, * vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".	2010-06-11 22:09:57 +03:00
Juri Linkov	56b2854f30	Move version control related files to the "vc" subdirectory. ... * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el, * ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el, * ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el, * ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el, * pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el, * smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el, * vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el, * vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el: Move files to the "vc" subdirectory.	2010-06-11 21:51:00 +03:00

Renamed from lisp/vc-git.el (Browse further)