1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-12 09:28:24 +00:00
Commit Graph

78 Commits

Author SHA1 Message Date
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
Eric S. Raymond
3702367bce Change 'needs-patch to 'needs-update. 2008-05-01 19:13:16 +00:00
Stefan Monnier
e0607aaa2c Make `checkout-model' apply to filesets.
* vc-hooks.el (vc-checkout-model): Rewrite.
(vc-before-save, vc-after-save): Adjust callers accordingly.
* vc.el (vc-editable-p, vc-next-action, vc-checkout, vc-update)
(vc-transfer-file): Adjust callers accordingly.
* vc-rcs.el (vc-rcs-checkout-model): Adjust arg.
(vc-rcs-state, vc-rcs-state-heuristic, vc-rcs-receive-file)
(vc-rcs-checkout, vc-rcs-fetch-master-state): Use vc-rcs-checkout-model
instead of vc-checkout-model.
* vc-mcvs.el (vc-mcvs-revert):
Use vc-mcvs-checkout-model i.s.o vc-checkout-model.
* vc-cvs.el (vc-cvs-checkout-model): Adjust arg.
(vc-cvs-revert): Use vc-cvs-checkout-model i.s.o vc-checkout-model.
* vc-svn.el (vc-svn-checkout-model):
* vc-hg.el (vc-hg-checkout-model):
* vc-git.el (vc-git-checkout-model):
* vc-bzr.el (vc-bzr-checkout-model): Adjust arg.
2008-04-29 15:32:56 +00:00
Dan Nicolaescu
c8149699a2 (vc-git-status-printer): Deal with directories. 2008-04-23 04:07:11 +00:00
Stefan Monnier
99e1b0c028 Rename vc-status to vc-dir. 2008-04-16 03:00:53 +00:00
Alexandre Julliard
d41080ca3f (vc-git-after-dir-status-stage)
(vc-git-dir-status-goto-stage): New functions.
(vc-git-after-dir-status-stage1)
(vc-git-after-dir-status-stage1-empty-db)
(vc-git-after-dir-status-stage2): Removed, functionality moved
into the new generic stage functions.
(vc-git-dir-status-files): New function.
2008-04-13 18:07:54 +00:00
Stefan Monnier
c1b513745f Change `dir-status' to not take (and pass) status-buffer.
(vc-status-create-fileinfo): Make `extra' optional.
(vc-status-busy): New fun.
(vc-status-menu-map): Use it.
(vc-status-crt-marked): Remove.
(vc-status-update): Rename from vc-status-add-entries.
Add argument so as to prevent addition of entries.  Rewrite.
(vc-update-vc-status-buffer): Remove.
(vc-status-refresh): Don't remove old entries, set them to
up-to-date instead.  Also do it after the update is complete.
(vc-status-marked-files): η-reduce.
2008-04-11 15:17:59 +00:00
Dan Nicolaescu
236b582755 * vc-git.el: Make vc-status display information about copies,
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.
2008-03-30 15:44:34 +00:00
Dan Nicolaescu
115c006177 * vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
(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.
2008-03-29 05:34:52 +00:00
Dan Nicolaescu
15c5c97086 * vc.el: Add new backend function 'status-extra-headers.
(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.
2008-03-28 03:50:26 +00:00
Dan Nicolaescu
f0e1713e2a (vc-git-extra-menu-map): New key map.
(vc-git-extra-menu, vc-git-extra-status-menu, vc-git-grep):
New functions.
2008-03-26 06:35:55 +00:00
Dan Nicolaescu
75cb52bed9 (vc-git-after-dir-status-stage1): Move state matching
code ...
(vc-git--state-code): ... to this new function.
(vc-git-state): Use it.
2008-03-24 08:21:43 +00:00
Dan Nicolaescu
8e4e4aefb6 (vc-git--empty-db-p)
(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.
2008-03-22 17:33:52 +00:00
Dan Nicolaescu
dd3ffb9a38 (vc-git-annotate-extract-revision-at-line):
Allow "^" in a version name.
2008-03-22 17:21:48 +00:00
Stefan Monnier
45b24b4de6 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
* 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.
2008-03-21 17:53:04 +00:00
Dan Nicolaescu
e345c46e56 (vc-git-status-result): New variable.
(vc-git-dir-status): Split out ...
(vc-git-after-dir-status-stage1, vc-git-after-dir-status-stage2):
... these new functions and work asynchronously.
2008-03-21 06:29:04 +00:00
Dan Nicolaescu
12cb746e0a (vc-git-after-dir-status): Remove.
(vc-git-dired-state-info): Reimplement.
2008-03-21 06:24:15 +00:00
Dan Nicolaescu
6a3f9bb72d * vc-hg.el (vc-hg-state):
* 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.
2008-03-21 05:53:48 +00:00
Dan Nicolaescu
751c9f0042 * vc.el (vc-exec-after): Move setting mode-line-process in the
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.
2008-02-22 07:44:08 +00:00
Thien-Thi Nguyen
758dc0cc60 (vc-git-after-dir-status, vc-git-dir-status): New funcs. 2008-02-18 07:46:44 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Michael Albinus
0664ff7221 * vc-git.el (vc-git--call): Apply `process-file' instead of
`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.
2008-01-08 20:07:21 +00:00
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Dan Nicolaescu
5378843c23 * vc-git.el (vc-git-dir-state):
* vc-hg.el (vc-hg-dir-state): Set the vc-backend property.
2008-01-04 07:59:25 +00:00
Dan Nicolaescu
b936ef8cc2 * vc-git.el (vc-git--ls-files-state): New function.
(vc-git-dir-state): Use it instead of processing the status
results here.
2008-01-03 06:29:38 +00:00
Dan Nicolaescu
21838dc0de (vc-git-dir-state): Set the vc-backend property. Do
not disable undo, with-temp-buffer does it by default.
2008-01-01 19:47:21 +00:00
Eric S. Raymond
484c1b1f14 * vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
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.
2007-12-29 13:20:49 +00:00
Eric S. Raymond
722f037fc8 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
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.
2007-12-28 18:16:55 +00:00
Eric S. Raymond
18e1f24981 * vc-bzr.el, vc-cvs.el, vc-git.el, vc-hg.el, vc-mcvs.el, vc-svn.el:
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.
2007-12-28 08:59:50 +00:00
Dan Nicolaescu
ff71e76d03 * vc-git.el (vc-git-dir-state): Fix the git command arguments. 2007-12-01 18:18:47 +00:00
Dan Nicolaescu
8d6d388da3 * vc-git.el (vc-git-dir-state): Fix the git command arguments. 2007-11-29 07:22:01 +00:00
Thien-Thi Nguyen
0bcc6163fe (vc-git-annotate-time): Handle optional field FILENAME.
Also, match one space at end of annotation text, after last paren.
2007-11-25 00:42:41 +00:00
Thien-Thi Nguyen
5fdbecd896 (vc-git--call, vc-git--out-ok): New funcs.
(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.
2007-11-24 15:22:07 +00:00
Thien-Thi Nguyen
2aa0736ab5 Refill; nfc. 2007-11-24 14:35:54 +00:00
Thien-Thi Nguyen
b16bd82da9 (vc-git-show-log-entry): New func. 2007-11-24 13:46:30 +00:00
Stefan Monnier
54a2247d6e * vc-bzr.el (vc-bzr-diff-tree):
* 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.
2007-10-20 01:28:35 +00:00
Stefan Monnier
9f11ce4ec3 (vc-git-revision-completion-table, vc-git-revision-table):
Make it work when the arg is a list of files.
2007-10-20 01:09:59 +00:00
Eric S. Raymond
5b5afd508a Carry through today's big terminology change to a few places where I
missed it in the back ends.
2007-10-10 19:39:23 +00:00