Commit graph

115 commits

Author SHA1 Message Date
Dan Nicolaescu
e2f3c6923a Add support for stashing a snapshot of the current tree.
* vc-git.el (vc-git-stash-snapshot): New function.
(vc-git-stash-map, vc-git-extra-menu-map): Add a mapping for it.
2009-12-08 15:56:57 +00:00
Dan Nicolaescu
662c5698fb Support showing a single log entry from vc-annotate.
* 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.
2009-12-07 09:02:11 +00:00
Dan Nicolaescu
0d3f8a7840 * vc-git.el (vc-git-print-log): Handle a limit argument. Display
the short log in graph form and with labels.
(vc-git-log-view-mode): Handle labels.
2009-12-06 22:18:03 +00:00
Dan Nicolaescu
cebf8ec6d9 Make vc-revert change VC state from 'added to 'unregistered.
* vc-git.el (vc-git-revert): Call git reset first.
2009-12-06 21:25:55 +00:00
Dan Nicolaescu
7fa4876f18 Support applying stashes. Improve UI.
* 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.
2009-12-03 04:08:08 +00:00
Dan Nicolaescu
379241fa2e (vc-git-registered): Call vc-git-root only once. 2009-11-30 21:21:35 +00:00
David Reitter
35179414e4 vc-git-registered: use checkout directory (where .git is)
rather than the file's directory and a relative path spec to work around a bug in git.
2009-11-24 15:31:01 +00:00
Dan Nicolaescu
48b2757534 * vc.el (vc-log-show-limit): Default to 2000.
(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.
2009-11-16 20:36:06 +00:00
Dan Nicolaescu
6616006b02 * vc.el (vc-log-show-limit): New variable.
(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
2009-11-15 20:28:58 +00:00
Glenn Morris
881e4184a3 (vc-git-stash-map): Move definition before use. 2009-11-05 03:24:08 +00:00
Dan Nicolaescu
d1e4c4037e Make vc-annotate work through copies and renames.
* 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.
2009-10-19 05:04:22 +00:00
Dan Nicolaescu
52964e5474 (vc-git-dir-extra-headers): Set the branch name
correctly in the detached head case.
(vc-git-print-log): Remove unused binding.
2009-10-14 06:28:00 +00:00
Dan Nicolaescu
0e172cc2c1 (vc-git-dir-extra-headers): Add keymap and mouse-face
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.
2009-09-20 19:51:35 +00:00
Dan Nicolaescu
79d316d36d (vc-git-log-view-mode): Undo inadvertent change. 2009-09-15 17:52:42 +00:00
Dan Nicolaescu
60308853c3 (vc-git-dir-extra-headers): Show the remote location. 2009-09-15 00:11:51 +00:00
Dan Nicolaescu
32ba3abcc1 * vc.el (top): print-log method now takes an optional SHORTLOG
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.
2009-09-14 04:38:49 +00:00
Nick Roberts
2f1c4cd068 (vc-git-annotate-command): Use separator to parse
arguments correctly.
2009-09-06 22:08:31 +00:00
Dan Nicolaescu
2ddf440db1 (vc-git-stash, vc-git-stash-show): New functions.
(vc-git-extra-menu-map): Bind them.
2009-08-26 07:01:09 +00:00
Dan Nicolaescu
b91f07620f (vc-git-register): Use "git add" for directories. 2009-08-26 06:48:58 +00:00
Michael Albinus
20c76c553c * vc-git.el (vc-git-registered, vc-git-working-revision)
(vc-git-find-revision, vc-git-diff, vc-git-revision-table)
(vc-git--empty-db-p): Let-bind `process-file-side-effects' with nil.
2009-08-25 09:01:38 +00:00
Dan Nicolaescu
bbe1f50262 (vc-git-annotate-command): Run asynchronously.
Explicitly pass the date format to git blame so that user local
so that the output format can be parsed.
2009-08-21 03:37:33 +00:00
Dan Nicolaescu
76e1446450 (vc-git-checkin): Fix typo. 2009-07-28 08:06:36 +00:00
Dan Nicolaescu
2a0e33798a (vc-git--run-command-string): Accept a nil FILE argument.
(vc-git-stash-list): New function.
(vc-git-dir-extra-headers): Use it.
2009-07-23 06:42:50 +00:00
Dan Nicolaescu
0a2ddfa661 (vc-git-add-signoff): New variable.
(vc-git-checkin): Use it.
(vc-git-toggle-signoff): New function.
(vc-git-extra-menu-map): Bind it to menu.
2009-07-23 05:17:27 +00:00
Dan Nicolaescu
3c3bf6ce8f Remove find-file-not-found-hook VC method. (Bug#2757)
* 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.
2009-06-26 23:53:55 +00:00
Alexandre Julliard
4537363ca5 * vc-git.el (vc-git-previous-revision, vc-git-next-revision):
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)
2009-03-13 20:04:11 +00:00
Dan Nicolaescu
c7f9e44060 * vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.
(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.
2009-02-11 06:36:32 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Andreas Schwab
7f4a3168c8 (vc-git-dir-printer): Fix filename column. 2008-12-27 22:24:31 +00:00
Glenn Morris
b6889b6553 (vc-git-diff-switches): Doc fix. 2008-12-03 07:36:53 +00:00
Glenn Morris
68159bc533 (vc-git-diff): No need to duplicate vc-switches logic. 2008-11-30 01:44:33 +00:00
Glenn Morris
a0bea999ea (vc-git-diff-switches): New option.
(vc-git-diff): Apply diff switches.  (Bug#1386)
Give it a basic doc string.
2008-11-26 02:55:28 +00:00
Dan Nicolaescu
13ad745788 * vc.el: Rename VC methods that were missed when vc-status was
renamed to vc-dir.
* vc-svn.el (vc-svn-dir-extra-headers): Rename from
vc-svn-status-extra-headers.
* vc-hg.el (vc-hg-dir-printer): Rename from vc-hg-status-printer.
(vc-hg-dir-extra-header): Rename from vc-hg-status-extra-headers.
* vc-git.el (vc-git-dir-printer): Rename from vc-dir-status-printer.
(vc-git-dir-extra-headers): Rename from vc-git-status-extra-headers.
* vc-dir.el (vc-dir-mode): Use vc-dir-printer instead of
vc-dir-status-printer.
(vc-dir-headers): Use `dir-extra-headers' instead of
`status-extra-headers'
(vc-dir-printer): Rename from vc-dir-status-printer.
(vc-default-dir-extra-headers): Rename from
vc-default-status-extra-headers.
* vc-cvs.el (vc-cvs-dir-extra-headers): Rename from
vc-cvs-status-extra-headers.
2008-10-27 07:21:43 +00:00
Dan Nicolaescu
07ebab6658 * vc-git.el (vc-git-show-log-entry): Include the revision in the
search string.
2008-10-14 07:05:07 +00:00
Dan Nicolaescu
89d9800051 * vc-bzr.el (vc-bzr-show-log-entry):
* vc-git.el (vc-git-show-log-entry): Deal with a nil argument,
C-x v l for a directory uses that.
2008-09-18 17:01:41 +00:00
Dan Nicolaescu
631601b5eb (vc-git-status-printer): Synchronize with the default. 2008-07-30 07:50:26 +00:00
Dan Nicolaescu
d1bfcce108 (vc-git-status-printer): Update the directory display
to match the default.
2008-07-22 02:20:10 +00:00
Dan Nicolaescu
8c3d7147da (vc-git--ls-files-state): Remove unused function. 2008-07-07 16:35:48 +00:00
Alexandre Julliard
934a944e54 * vc-git.el (vc-git-registered): Return true for removed files.
(vc-git-print-log, vc-git-log-view-mode): Print a single log for
all the files instead of one per file.
(vc-git-previous-revision): Add support for project-wide previous
revision when specified file is nil.
2008-07-05 18:42:07 +00:00
Magnus Henoch
1f8da6df7d 2008-07-02 Magnus Henoch <mange@freemail.hu>
* vc-git.el (vc-git-annotate-command): Use proper option for
    	specifying revision.
2008-07-02 11:56:11 +00:00
Dan Nicolaescu
10c7e43106 * vc-hg.el:
* vc-git.el: Require vc-dir when compiling.
2008-06-25 05:35:05 +00:00
Dan Nicolaescu
f8bd9ac6ef * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
* vc-rcs.el (vc-annotate-convert-time):
* vc-mtn.el (vc-annotate-convert-time):
* vc-git.el (vc-annotate-convert-time):
* vc-cvs.el (vc-annotate-convert-time):
* vc-bzr.el (vc-annotate-convert-time): Declare as functions.
2008-06-24 02:41:04 +00:00
Eric S. Raymond
370fded4f6 Snapshot primitives globally renamed to refer to tags, documentation updated. 2008-05-15 17:38:50 +00:00
Eric S. Raymond
2888a97eb5 Remove assumption about what nil means as a first arument to vc-do-command. 2008-05-10 13:27:16 +00:00
Eric S. Raymond
6aa5d910bf Remove wash-log from the VC backend API. 2008-05-09 17:30:49 +00:00
Eric S. Raymond
4903369afe Remove VC-Dired and backend dir-state methods. 2008-05-07 21:27:41 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Eric S. Raymond
7265c6e8a8 Remove logentry primitive from backend API. 2008-05-03 07:39:17 +00:00
Eric S. Raymond
70e2f6c752 Clean up vc*-revision-granularity and vc*-checkout-model. 2008-05-02 17:47:25 +00:00
Eric S. Raymond
0a29940833 Name change in preparation for ripping out vc-dired. 2008-05-02 06:56:59 +00:00