summaryrefslogtreecommitdiff
path: root/lisp/vc-git.el
Commit message (Collapse)AuthorAgeFilesLines
* * vc-git.el: Make vc-status display information about copies,Dan Nicolaescu2008-03-301-9/+121
| | | | | | | | | | | | | renames and permission changes. (vc-git-extra-fileinfo): New defstruct. (vc-git-escape-file-name, vc-git-file-type-as-string) (vc-git-rename-as-string, vc-git-permissions-as-string) (vc-git-status-printer): New functions. (vc-git-after-dir-status-stage2): Also return vc-git-extra-fileinfo. (vc-git-after-dir-status-stage1): Look for copies, renames and permission changes. (vc-git-after-dir-status-stage1-empty-db): Set permissions. (vc-git-dir-status): Ask for staged files and renames.
* * vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.Dan Nicolaescu2008-03-291-18/+11
| | | | | | | | | | | | | | | | | | | | (vc-status-refresh): Create a temporary buffer and call the `dir-status' backend function from that buffer. * vc-bzr.el (vc-bzr-dir-status): Don't create a buffer. (vc-bzr-after-dir-status): Don't kill the buffer. * vc-cvs.el (vc-cvs-dir-status): Don't create a buffer. (vc-cvs-after-dir-status): Don't kill the buffer. * vc-git.el (vc-git-dir-status): Don't create a buffer. (vc-git-after-dir-status-stage2): Don't kill the buffer. * vc-hg.el (vc-hg-dir-status): Don't create a buffer. (vc-hg-after-dir-status): Don't kill the buffer. * vc-svn.el (vc-svn-dir-status): Don't create a buffer. (vc-svn-after-dir-status): Don't kill the buffer.
* * vc.el: Add new backend function 'status-extra-headers.Dan Nicolaescu2008-03-281-0/+12
| | | | | | | (vc-default-status-extra-headers): New function. (vc-status-headers): Call 'status-extra-headers. Add colors. * vc-git.el (vc-git-status-extra-headers): New function.
* (vc-git-extra-menu-map): New key map.Dan Nicolaescu2008-03-261-1/+65
| | | | | (vc-git-extra-menu, vc-git-extra-status-menu, vc-git-grep): New functions.
* (vc-git-after-dir-status-stage1): Move state matchingDan Nicolaescu2008-03-241-8/+12
| | | | | | code ... (vc-git--state-code): ... to this new function. (vc-git-state): Use it.
* (vc-git--empty-db-p)Dan Nicolaescu2008-03-221-5/+23
| | | | | | (vc-git-after-dir-status-stage1-empty-db): New functions. (vc-git-dir-status, vc-git-after-dir-status-stage1, vc-git-state): Add support for empty repositories.
* (vc-git-annotate-extract-revision-at-line):Dan Nicolaescu2008-03-221-1/+1
| | | | Allow "^" in a version name.
* * vc-hooks.el (vc-default-mode-line-string): Add case for added files.Stefan Monnier2008-03-211-8/+0
| | | | | | | | | | | * vc.el (vc-default-dired-state-info): Use just "modified". * vc-cvs.el (vc-cvs-state-heuristic): Turn rev 0 into `added'. (vc-cvs-mode-line-string): Make use of the better default. (vc-cvs-parse-entry): Use the new `added'. (vc-cvs-dired-state-info): Remove. * vc-svn.el (vc-svn-dired-state-info): Remove. * vc-hg.el (vc-hg-dired-state-info): Remove. * vc-git.el (vc-git-dired-state-info): Remove.
* (vc-git-status-result): New variable.Dan Nicolaescu2008-03-211-22/+35
| | | | | | (vc-git-dir-status): Split out ... (vc-git-after-dir-status-stage1, vc-git-after-dir-status-stage2): ... these new functions and work asynchronously.
* (vc-git-after-dir-status): Remove.Dan Nicolaescu2008-03-211-41/+27
| | | | (vc-git-dired-state-info): Reimplement.
* * vc-hg.el (vc-hg-state):Dan Nicolaescu2008-03-211-2/+2
| | | | | | | * vc-git.el (vc-git-state): * vc-cvs.el (vc-cvs-parse-status): * vc-bzr.el (vc-bzr-state): Return 'added when the file is in that state.
* * vc.el (vc-exec-after): Move setting mode-line-process in theDan Nicolaescu2008-02-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | busy case ... (vc-set-mode-line-busy-indicator): ... in this new function. (vc-status-refresh): Call vc-set-mode-line-busy-indicator. (vc-update-vc-status-buffer): Reset mode-line-process. (vc-status-mark-all-files, vc-status-unmark-all-files): Change to mark/unmark all the files with the same state as the current one. With a prefix argument mark/unmark all files. (vc-status-mode-menu): Adjust strings. (vc-update-vc-status-buffer): Only do something when the argument is not nil. (vc-status-kill-dir-status-process): New function. (vc-status-mode-map): Bind it. (vc-status-process-buffer): New variable. (vc-status-mode): Make it local. (vc-status-refresh): Set it. * vc-hg.el (vc-hg-dir-status): * vc-git.el (vc-git-dir-status): * vc-svn.el (vc-svn-dir-status): Return the buffer in which the command is run.
* (vc-git-after-dir-status, vc-git-dir-status): New funcs.Thien-Thi Nguyen2008-02-181-0/+47
|
* Merge from emacs--rel--22Miles Bader2008-01-081-1/+1
|\ | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
| |
| * * vc-git.el (vc-git-dir-state):Dan Nicolaescu2008-01-041-0/+3
| | | | | | | | * vc-hg.el (vc-hg-dir-state): Set the vc-backend property.
| * * vc-git.el (vc-git-dir-state): Fix the git command arguments.Dan Nicolaescu2007-12-011-1/+1
| |
* | * vc-git.el (vc-git--call): Apply `process-file' instead ofMichael Albinus2008-01-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | `call-process'. * net/tramp.el (tramp-remote-process-environment): Add "LC_CTYPE=C". Reported by Pete Forman <pete.forman@westerngeco.com>. (tramp-perl-encode, tramp-perl-decode): Update copyrights. (tramp-handle-process-file): Handle the case where DESTINATION is a consp with t as car. (tramp-wait-for-output): We shall remove exactly what has been find by the search.
* | * vc-git.el (vc-git--ls-files-state): New function.Dan Nicolaescu2008-01-031-33/+18
| | | | | | | | | | (vc-git-dir-state): Use it instead of processing the status results here.
* | (vc-git-dir-state): Set the vc-backend property. DoDan Nicolaescu2008-01-011-1/+4
| | | | | | | | not disable undo, with-temp-buffer does it by default.
* | * vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,Eric S. Raymond2007-12-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and 'unregistered states. * vc-hooks.el (vc-state): Added 'removed state to documentation. * vc-hg (vc-hg-parse-status): Recognize 'added, 'removed, and 'up-to-date state. Deal with the possibility that C for clean might change to "=" in the next point release. * vc-git.el (vc-git-parse-status): Recognize 'removed. * vc.el (header comment): Better description of new dir-state. (vc-compatible-state): Defines which states are mutually compatible; usable with 'edited as a test for which can be committed on. (vc-dired-hook): Turn off undo in the VC-Dired buffer, a speed tweak. (vc-default-dired-state-info): Display 'removed state. * vc-bzr.el (vc-bzr-dir-state): Recognize 'added.
* | * vc-hooks.el (vc-state): Document new 'ignored and 'unregisteredEric S. Raymond2007-12-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | states. and the new return-value convention. These are not actually used yet, just set. * vc-svn.el (vc-svn-parse-status): Set 'ignored and 'unregistered states when appropriate. * vc-hg.el (vc-hg-state,vc-hg-dir-state): Set 'ignored and 'unregistered' when appropriate. * vc-git.el: Document that we don't set the new states yet. * vc.el (vc-dired-state-info): Display 'unregistered and 'ignored states. * vc-cvs.el (vc-cvs-parse-status): Set the 'ignored state when appropriate. * vc-bzr.el (vc-bzr-dir-state): Set 'ignored and 'unregistered' when appropriate.
* | * vc-bzr.el, vc-cvs.el, vc-git.el, vc-hg.el, vc-mcvs.el, vc-svn.el:Eric S. Raymond2007-12-281-0/+1
| | | | | | | | | | | | Modify all instances of the dir-state back-end method to suppress keeping undo lists on the buffers holding astatus output, which csn get extremely large.
* | * vc-git.el (vc-git-dir-state): Fix the git command arguments.Dan Nicolaescu2007-11-291-1/+1
| |
* | (vc-git-annotate-time): Handle optional field FILENAME.Thien-Thi Nguyen2007-11-251-1/+1
| | | | | | | | Also, match one space at end of annotation text, after last paren.
* | (vc-git--call, vc-git--out-ok): New funcs.Thien-Thi Nguyen2007-11-241-20/+16
| | | | | | | | | | | | | | | | (vc-git-state): Use vc-git--call. (vc-git-registered, vc-git-working-revision) (vc-git-previous-revision, vc-git-next-revision) (vc-git--run-command-string, vc-git-symbolic-commit): Use vc-git--out-ok.
* | Refill; nfc.Thien-Thi Nguyen2007-11-241-51/+60
| |
* | (vc-git-show-log-entry): New func.Thien-Thi Nguyen2007-11-241-1/+14
| |
* | * vc-bzr.el (vc-bzr-diff-tree):Stefan Monnier2007-10-201-5/+1
| | | | | | | | | | | | | | | | * vc-git.el (vc-git-diff-tree): * vc-hg.el (vc-hg-diff-tree): * vc-mcvs.el (vc-mcvs-diff-tree): * vc-mtn.el (vc-mtn-diff-tree): * vc-svn.el (vc-svn-diff-tree): Remove.
* | (vc-git-revision-completion-table, vc-git-revision-table):Stefan Monnier2007-10-201-4/+5
| | | | | | | | Make it work when the arg is a list of files.
* | Carry through today's big terminology change to a few places where IEric S. Raymond2007-10-101-8/+8
| | | | | | | | missed it in the back ends.
* | Terminology cleanup.Eric S. Raymond2007-10-101-7/+7
| |
* | Merge from emacs--rel--22Miles Bader2007-10-091-19/+11
|\ \ | |/ | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
| * (vc-git-log-view-mode): Add font-lock patterns forDan Nicolaescu2007-09-171-0/+8
| | | | | | | | Signed-off-by, Acked-by and Merge.
| * * vc-git.el (vc-git-state): Call git-add --refresh to update theDan Nicolaescu2007-08-271-19/+3
| | | | | | | | | | | | | | state of the file. (vc-git-workfile-unchanged-p): Delegate implementation to vc-git-state. (vc-git-create-repo): Fixed invalid command.
| * Change capitalization of VC backend names for new backendsMiles Bader2007-08-031-5/+5
| | | | | | | | Revision: emacs@sv.gnu.org/emacs--rel--22--patch-87
| * * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):Dan Nicolaescu2007-07-301-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove. (vc-git-revision-completion-table): Enable. * vc-hooks.el (vc-handled-backends): Add GIT and HG. * vc.el (vc-directory-exclusion-list): Add .git and .hg. * vc-hg.el (vc-hg-revision-completion-table): Re-enable. * diff-mode.el (diff-mode-menu): New entries. * diff-mode.el (diff-beginning-of-file-and-junk): New function. (diff-file-kill): Use it. (diff-beginning-of-hunk): Add arg `try-harder' using it. (diff-restrict-view, diff-find-source-location, diff-refine-hunk): Use it so they find the hunk even when we're in the file header. * vc.el: Add new VC operation `revision-completion-table'. (vc-default-revision-completion-table): New function. (vc-version-diff, vc-version-other-window): Use it to provide completion of revision names if the backend provides it. * vc-arch.el (vc-arch--version-completion-table) (vc-arch-revision-completion-table): New functions to provide completion of revision names. * vc-cvs.el: Require CL. (vc-cvs-revision-table, vc-cvs-revision-completion-table): New functions to provide completion of revision names. * eval.c (init_eval_once): Bump max_lisp_eval_depth to 400. * vc2-xtra.texi (Customizing VC): Add GIT and HG.
| * *** empty log message ***Dan Nicolaescu2007-07-281-0/+7
| |
| * New File.Dan Nicolaescu2007-07-281-0/+468
|
* * vc-git.el (vc-git-mode-line-string): New function.Dan Nicolaescu2007-08-251-1/+13
|
* Change capitalization of VC backend names for new backendsMiles Bader2007-08-031-5/+5
| | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-842
* (vc-git-print-log): Support both the old single fileDan Nicolaescu2007-07-281-2/+5
| | | | interface and the new one.
* * vc-git.el: Relicense to GPLv3 or later.Dan Nicolaescu2007-07-261-7/+1
| | | | | | | | | | (vc-directory-exclusion-list, vc-handled-backends): Remove. * vc-hooks.el (vc-handled-backends): Add GIT. * vc.el (vc-directory-exclusion-list): Add .git. * vc2-xtra.texi (Customizing VC): Add GIT.
* vc-git.el (vc-git-revision-table)Dan Nicolaescu2007-07-261-26/+42
| | | | (vc-git-revision-completion-table): New functions.
* Fix comment.Dan Nicolaescu2007-07-251-1/+1
|
* * vc-git.el (vc-git-log-view-mode): Port to the multi-file vc interface.Dan Nicolaescu2007-07-251-14/+29
| | | | (vc-git-create-snapshot, vc-git-retrieve-snapshot): New functions.
* vc-git.el (vc-git-print-log): Fix previous change.Dan Nicolaescu2007-07-241-15/+13
|
* vc-git.el (vc-git-checkout, vc-directory-exclusion-list): FixDan Nicolaescu2007-07-241-5/+6
| | | | typos.
* (vc-git-unregister): New function.Dan Nicolaescu2007-07-231-1/+5
|
* (vc-git-delete-file, vc-git-rename-file): New functions.Dan Nicolaescu2007-07-231-14/+13
| | | | | (vc-git-find-version): Use the result of ls-files as a parameter for cat-file
View Lorry Controller Status