summaryrefslogtreecommitdiff
path: root/lisp/vc-git.el
Commit message (Collapse)AuthorAgeFilesLines
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-1031/+0
| | | | | | | | | | | | * 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.
* Improve support for special markup in the VC commit message.Dan Nicolaescu2010-06-081-1/+2
| | | | | | | * lisp/vc-mtn.el (vc-mtn-checkin): Add support for Author: and Date: markup. * lisp/vc-hg.el (vc-hg-checkin): Add support for Date:. * lisp/vc-git.el (vc-git-checkin): * lisp/vc-bzr.el (vc-bzr-checkin): Likewise.
* vc-log-incoming/vc-log-outgoing fixes for Git.Dan Nicolaescu2010-06-051-22/+6
| | | | | | | | * lisp/vc-git.el (vc-git-log-view-mode): Fix font lock for incoming/outgoing logs. (vc-git-log-outgoing, vc-git-log-incoming): Use @{upstream} instead of vc-git-compute-remote. (vc-git-compute-remote): Remove.
* vc-log-incoming/vc-log-outgoing improvements for Git.Dan Nicolaescu2010-06-031-8/+14
| | | | | | * lisp/vc-git.el (vc-git-log-outgoing): Use the same format as the short log. (vc-git-log-incoming): Likewise. Run "git fetch" before the log command.
* Add support for vc-log-incoming, improve vc-log-outgoing for Git.Dan Nicolaescu2010-06-011-3/+27
| | | | | | * lisp/vc-git.el (vc-git-compute-remote): New function. (vc-git-log-outgoing): Use it instead of hard coding a value. (vc-git-log-incoming): New function.
* Make the log-edit comments use RFC822 format throughout.Stefan Monnier2010-04-201-20/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vc.el (vc-checkin, vc-modify-change-comment): Adjust to new vc-start/finish-logentry. (vc-find-conflicted-file): New command. (vc-transfer-file): Adjust to new vc-checkin. (vc-next-action): Improve scoping. * vc-hg.el (vc-hg-log-edit-mode): Remove. (vc-hg-checkin): Remove extra arg. Use log-edit-extract-headers. * vc-git.el (vc-git-log-edit-mode): Remove. (vc-git-checkin): Remove extra arg. Use log-edit-extract-headers. (vc-git-commits-coding-system): Rename from git-commits-coding-system. * vc-dispatcher.el (vc-log-edit): Shorten names for log-edit-show-files. (vc-start-logentry): Remove argument `extra'. (vc-finish-logentry): Remove extra args. * vc-bzr.el (vc-bzr-log-edit-mode): Remove. (vc-bzr-checkin): Remove extra arg. Use log-edit-extract-headers. (vc-bzr-conflicted-files): New function. * log-edit.el (log-edit-extra-flags) (log-edit-before-checkin-process): Remove. (log-edit-summary, log-edit-header, log-edit-unknown-header): New faces. (log-edit-headers-alist): New var. (log-edit-header-contents-regexp): New const. (log-edit-match-to-eoh): New function. (log-edit-font-lock-keywords): Use them. (log-edit): Insert a "Summary:" header as default. (log-edit-mode): Mark font-lock rules as case-insensitive. (log-edit-done): Cleanup headers. (log-view-process-buffer): Remove. (log-edit-extract-headers): New function to replace it.
* Merge from emacs-23Stefan Monnier2010-04-191-1/+4
|\
| * Improve previous change.Glenn Morris2010-04-151-1/+3
| |
| * * vc-git.el (vc-git-print-log): Doc fix.Glenn Morris2010-04-151-1/+2
| |
* | Add --author support to git commit.Dan Nicolaescu2010-04-091-3/+18
| | | | | | | | | | | | | | * vc-git.el (vc-git-checkin): Pass extra-args to the commit command. (vc-git-log-edit-mode): New minor mode. (log-edit-mode, log-edit-extra-flags, log-edit-mode): New declarations.
* | Improve documentation comments.Eric S. Raymond2010-04-091-1/+8
| |
* | Add new VC methods: vc-log-incoming and vc-log-outgoing.Dan Nicolaescu2010-04-061-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vc.el (vc-print-log-setup-buttons): New function split out from vc-print-log-internal. (vc-log-internal-common): New function, a parametrized version of vc-print-log-internal. (vc-print-log-internal): Just call vc-log-internal-common with the right arguments. (vc-incoming-outgoing-internal): (vc-log-incoming, vc-log-outgoing): New functions. (vc-log-view-type): New permanent local variable. * vc-hooks.el (vc-menu-map): Bind vc-log-incoming and vc-log-outgoing. * vc-bzr.el (vc-bzr-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. (vc-bzr-log-incoming, vc-bzr-log-outgoing): New functions. * vc-git.el (vc-git-log-outgoing): New function. (vc-git-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. * vc-hg.el (vc-hg-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. Highlight the tag. (vc-hg-log-incoming, vc-hg-log-outgoing): New functions. (vc-hg-outgoing, vc-hg-incoming, vc-hg-outgoing-mode): (vc-hg-incoming-mode): Remove. (vc-hg-extra-menu-map): Do not bind vc-hg-incoming and vc-hg-outgoing.
* | Add special markup processing for commit logs.Dan Nicolaescu2010-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * log-edit.el (log-edit-extra-flags): New variable. (log-edit): Add new argument MODE. Use that mode when non-nil instead of the log-view-mode. (log-view-process-buffer): New function. * vc.el: Document that the checkin method takes optional arguments. Document new backend specific method: log-view-mode. (vc-default-log-edit-mode): New function. (vc-checkin): Use a backend specific log-view-mode. Pass extra arguments to the checkin method. (vc-modify-change-comment): Pass a dummy extra argument. * vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to log-edit. (vc-start-logentry): Add a mode argument, pass it to vc-log-edit. (vc-finish-logentry): Process the log buffer before passing it down. Pass log-edit-extra-flags. * vc-bzr.el (vc-bzr-checkin): Pass extra arguments to the commit command. (log-edit-extra-flags, log-edit-before-checkin-process): New declarations. * vc-hg.el (vc-hg-checkin): Pass extra arguments to the commit command. (log-edit-extra-flags, log-edit-before-checkin-process): New declarations. (vc-hg-log-edit-mode): New derived mode. * vc-arch.el (vc-arch-checkin): * vc-cvs.el (vc-cvs-checkin): * vc-git.el (vc-git-checkin): * vc-mtn.el (vc-mtn-checkin): * vc-rcs.el (vc-rcs-checkin): * vc-sccs.el (vc-sccs-checkin): * vc-svn.el (vc-svn-checkin): Add an optional ignored argument.
* | vc-git.el (vc-git-revision-table): Include remote branches.Stefan Monnier2010-03-101-1/+2
|/
* (vc-git-print-log): Use "tformat:" for shortlog, instead of "format:"Miles Bader2010-03-091-1/+1
| | | | This ensures that the output is newline-terminated.
* Correct pathname for vc-git-annotate-extract-revision-at-line (Bug#5657)Chong Yidong2010-03-071-1/+2
| | | | | * vc-git.el (vc-git-annotate-extract-revision-at-line): Use vc-git-root as default direcotry for revision path (Bug#5657).
* * vc-git.el: Re-flow to fit into 80 columns.Stefan Monnier2010-03-051-69/+105
| | | | | | | (vc-git-after-dir-status-stage, vc-git-dir-status-goto-stage): Remove spurious `quote' element in each case alternative. (vc-git-show-log-entry): Use prog1. (vc-git-after-dir-status-stage): Remove unused var `remaining'.
* (vc-git-dir-status-goto-stage): Pass --relative to theEric Hanchrow2010-01-241-1/+1
| | | | diff-index command. This requires at least git-1.5.5. (Bug#1589).
* Remove support for adding --signoff on commit.Dan Nicolaescu2010-01-241-16/+1
| | | | | | | Future support will use an incompatible generic mechanism. * vc-git.el (vc-git-add-signoff): Remove variable. (vc-git-toggle-signoff): Remove function. (vc-git-extra-menu-map): Do not bind vc-git-toggle-signoff.
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
|
* Supersede color.diff settings in git log (bug#5211).Juanma Barranquero2009-12-281-1/+1
|
* Add support for stashing a snapshot of the current tree.Dan Nicolaescu2009-12-081-2/+17
| | | | | * vc-git.el (vc-git-stash-snapshot): New function. (vc-git-stash-map, vc-git-extra-menu-map): Add a mapping for it.
* Support showing a single log entry from vc-annotate.Dan Nicolaescu2009-12-071-10/+14
| | | | | | | | | | | | | | | | | | | | * vc.el (print-log): Add a new argument: START-REVISION. (vc-print-log-internal): Add a new optional argument and pass it to the backend. (vc-print-log, vc-print-root-log): Adjust callers. * vc-annotate.el (vc-annotate-show-log-revision-at-line): If a buffer already displays the requested log entry, use it. Otherwise display only the log entry in question. * vc-svn.el (vc-svn-print-log): * vc-mtn.el (log-view-file-re): * vc-hg.el (vc-hg-state): * vc-git.el (vc-git-print-log): Add support for new argument START-REVISION. (vc-git-show-log-entry): Return t on success. * vc-bzr.el (vc-bzr-print-log): Add support new argument START-REVISION. (vc-bzr-show-log-entry): Return t on success. * vc-rcs.el (vc-rcs-print-log): * vc-sccs.el (vc-sccs-print-log): * vc-cvs.el (vc-cvs-print-log): Add new argument, ignore it.
* * vc-git.el (vc-git-print-log): Handle a limit argument. DisplayDan Nicolaescu2009-12-061-15/+18
| | | | | the short log in graph form and with labels. (vc-git-log-view-mode): Handle labels.
* Make vc-revert change VC state from 'added to 'unregistered.Dan Nicolaescu2009-12-061-1/+2
| | | | * vc-git.el (vc-git-revert): Call git reset first.
* Support applying stashes. Improve UI.Dan Nicolaescu2009-12-031-2/+53
| | | | | | | | | * vc-git.el (vc-git-dir-extra-headers): Add tooltips. (vc-git-stash-apply, vc-git-stash-pop) (vc-git-stash-apply-at-point, vc-git-stash-pop-at-point) (vc-git-stash-menu): New functions. (vc-git-stash-menu-map): New variable. (vc-git-stash-map): Add bindings to popup a menu and to apply stashes.
* (vc-git-registered): Call vc-git-root only once.Dan Nicolaescu2009-11-301-20/+20
|
* vc-git-registered: use checkout directory (where .git is)David Reitter2009-11-241-1/+5
| | | | rather than the file's directory and a relative path spec to work around a bug in git.
* * vc.el (vc-log-show-limit): Default to 2000.Dan Nicolaescu2009-11-161-1/+2
| | | | | | | | | | | (vc-print-log-internal): Insert buttons to request more entries when limiting the output. * vc-sccs.el (vc-sccs-print-log): * vc-rcs.el (vc-rcs-print-log): * vc-cvs.el (vc-cvs-print-log): * vc-git.el (vc-git-print-log): Return 'limit-unsupported when LIMIT is non-nil.
* * vc.el (vc-log-show-limit): New variable.Dan Nicolaescu2009-11-151-2/+2
| | | | | | | | | | | | | | | | | | | (vc-print-log, vc-print-root-log): Add new argument LIMIT. Set it when using a prefix argument. (vc-print-log-internal): Add new argument LIMIT. * vc-svn.el (vc-svn-print-log): * vc-mtn.el (vc-mtn-print-log): * vc-hg.el (vc-hg-print-log): * vc-bzr.el (vc-bzr-print-log): Add new optional argument LIMIT, pass it to the log command when set. Make the BUFFER argument non-optional. * vc-sccs.el (vc-sccs-print-log): * vc-rcs.el (vc-rcs-print-log): * vc-git.el (vc-git-print-log): * vc-cvs.el (vc-cvs-print-log): Add new optional argument LIMIT, ignore it. Make the BUFFER argument non-optional
* (vc-git-stash-map): Move definition before use.Glenn Morris2009-11-051-7/+7
|
* Make vc-annotate work through copies and renames.Dan Nicolaescu2009-10-191-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * vc-annotate.el (vc-annotate-extract-revision-at-line): Return the file name too. (vc-annotate-revision-at-line) (vc-annotate-find-revision-at-line) (vc-annotate-revision-previous-to-line) (vc-annotate-show-log-revision-at-line): Update to get the file name from vc-annotate-extract-revision-at-line. (vc-annotate-show-diff-revision-at-line-internal): Change the argument to mean whether to show a file diff or not. Get the file name from vc-annotate-extract-revision-at-line. (vc-annotate-show-diff-revision-at-line): Update vc-annotate-show-diff-revision-at-line call. (vc-annotate-warp-revision): Add an optional file argument. * vc-git.el (vc-git-annotate-command): Pass -C -C to the blame command. (vc-git-annotate-extract-revision-at-line): Also return the file name if found. * vc-hg.el (vc-hg-annotate-command): Pass --follow to the annotate command. Remove unused code. (vc-hg-annotate-re): Update to match --follow output. (vc-hg-annotate-extract-revision-at-line): Also return the file name if found. * vc.el: Update annotate-extract-revision-at-line documentation.
* (vc-git-dir-extra-headers): Set the branch nameDan Nicolaescu2009-10-141-5/+2
| | | | | correctly in the detached head case. (vc-git-print-log): Remove unused binding.
* (vc-git-dir-extra-headers): Add keymap and mouse-faceDan Nicolaescu2009-09-201-10/+46
| | | | | | | | properties to the stash strings. (vc-git-stash-list): Return a list of strings. (vc-git-stash-get-at-point, vc-git-stash-delete-at-point) (vc-git-stash-show-at-point): New functions. (vc-git-stash-map): New keymap.
* (vc-git-log-view-mode): Undo inadvertent change.Dan Nicolaescu2009-09-151-1/+1
|
* (vc-git-dir-extra-headers): Show the remote location.Dan Nicolaescu2009-09-151-6/+28
|
* * vc.el (top): print-log method now takes an optional SHORTLOGDan Nicolaescu2009-09-141-7/+24
| | | | | | | | | | | | | | | | | | | argument. Add a new method: root. * vc-hooks.el (vc-prefix-map, vc-menu-map): Add bindings for vc-print-root-log and vc-print-root-diff. * vc-bzr.el (vc-bzr-log-view-mode, vc-bzr-print-log): * vc-git.el (vc-git-print-log, vc-git-log-view-mode): * vc-hg.el (vc-hg-print-log, vc-hg-log-view-mode): Add support for short logs. * vc-cvs.el (vc-cvs-print-log): * vc-mtn.el (vc-mtn-print-log): * vc-rcs.el (vc-rcs-print-log): * vc-sccs.el (vc-sccs-print-log): * vc-svn.el (vc-svn-print-log): Add an optional argument shortlog that is ignored for now.
* (vc-git-annotate-command): Use separator to parseNick Roberts2009-09-061-1/+1
| | | | arguments correctly.
* (vc-git-stash, vc-git-stash-show): New functions.Dan Nicolaescu2009-08-261-0/+24
| | | | (vc-git-extra-menu-map): Bind them.
* (vc-git-register): Use "git add" for directories.Dan Nicolaescu2009-08-261-48/+56
|
* * vc-git.el (vc-git-registered, vc-git-working-revision)Michael Albinus2009-08-251-19/+25
| | | | | (vc-git-find-revision, vc-git-diff, vc-git-revision-table) (vc-git--empty-db-p): Let-bind `process-file-side-effects' with nil.
* (vc-git-annotate-command): Run asynchronously.Dan Nicolaescu2009-08-211-1/+1
| | | | | Explicitly pass the date format to git blame so that user local so that the output format can be parsed.
* (vc-git-checkin): Fix typo.Dan Nicolaescu2009-07-281-1/+1
|
* (vc-git--run-command-string): Accept a nil FILE argument.Dan Nicolaescu2009-07-231-4/+22
| | | | | (vc-git-stash-list): New function. (vc-git-dir-extra-headers): Use it.
* (vc-git-add-signoff): New variable.Dan Nicolaescu2009-07-231-1/+17
| | | | | | (vc-git-checkin): Use it. (vc-git-toggle-signoff): New function. (vc-git-extra-menu-map): Bind it to menu.
* Remove find-file-not-found-hook VC method. (Bug#2757)Dan Nicolaescu2009-06-261-1/+0
| | | | | | | | | | * vc-hooks.el (vc-file-not-found-hook) (vc-default-find-file-not-found-hook): Remove functions. (find-file-not-found-functions): Do not add vc-file-not-found-hook. * vc-rcs.el (vc-rcs-find-file-not-found-hook): Remove function. * vc.el: * vc-hg.el: * vc-git.el: Do not mention find-file-not-found-hook VC method.
* * vc-git.el (vc-git-previous-revision, vc-git-next-revision):Alexandre Julliard2009-03-131-32/+34
| | | | | | | Fall back to original commit if vc-git-symbolic-commit fails to find a symbolic name. (vc-git-symbolic-commit): Don't limit search to tags. Treat "undefined" as an error. (Bug #2110)
* * vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.Dan Nicolaescu2009-02-111-0/+1
| | | | | | | (vc-default-dir-printer): Add a comment about updating this function. * vc-git.el (vc-git-dir-printer): Use vc-dir-filename-mouse-map for the file name.
* Add 2009 to copyright years.Glenn Morris2009-01-051-1/+1
|
* (vc-git-dir-printer): Fix filename column.Andreas Schwab2008-12-271-1/+1
|
View Lorry Controller Status