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

108 Commits

Author SHA1 Message Date
Thien-Thi Nguyen
b038f9fb95 Make sure all backends support vc-BACKEND-root.
* vc-hooks.el (vc-find-root): Take optional arg INVERT.
If non-nil, reverse the sense of the check.
* vc-rcs.el (vc-rcs-root): New func.
* vc-cvs.el (vc-cvs-root): New func.
* vc-svn.el (vc-svn-root): New func.
2008-02-19 11:45:54 +00:00
Dan Nicolaescu
c6a234ac6c * vc.el (vc-update): Resolve conflicts if necessary instead of
just updating the buffer.

* vc-cvs.el (vc-cvs-merge-news): Ignore the error status of the
update command so that we can parse the output.
2008-01-13 20:03:35 +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
Stefan Monnier
d58107b04c (vc-cvs-annotate-time): Don't move backward when text
gets inserted out-of-order.
2008-01-05 05:19:00 +00:00
Dan Nicolaescu
8c58d37d56 (vc-cvs-parse-entry): Set the vc-backend property. 2007-12-31 20:43: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
0f67cc71b4 * vc-cvs.el, vc-svn.el: Simplify backend dired-state-info
functions so they don't do work that the default one can do instead
2007-12-28 16:24:31 +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
Eric S. Raymond
9b64a7f0cf * (vc.el, vc-sccs.el, vc-rcs.el, vc-cs.el, vc-mcvs.el): Put
machinery in place to support editing of change comments
with 'e' in a log-view buffer.  Not documented yet as this
only works for SCCS, RCS, and maybe CVS if you have admin
privileges.  When we have backend support for Subversion and
more modern systems it will ve time to write this up.
2007-12-27 11:26:27 +00:00
Eric S. Raymond
be01714b8f *** empty log message *** 2007-12-27 03:17:24 +00:00
Eric S. Raymond
cdce374aed *** empty log message *** 2007-12-26 23:24:08 +00:00
Deepak Goel
8c16bd8c35 Fix buggy calls to `error'. 2007-12-06 17:56:42 +00:00
Dan Nicolaescu
2e7a8a21c9 (vc-cvs-diff): If backup files exist, diff them
instead of doing "cvs diff" in order to avoid accessing the
repository.
2007-11-12 03:56:38 +00:00
Dan Nicolaescu
fe1919ab86 * vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.
* vc-svn.el (vc-svn-print-log, vc-svn-diff):
* vc-mcvs.el (vc-mcvs-print-log, vc-mcvs-annotate-command):
* vc-cvs.el (vc-cvs-print-log, vc-cvs-diff)
(vc-cvs-annotate-command):
* vc-arch.el (vc-arch-diff): Remove test to check if start-process
is bound, it always is.
2007-11-10 05:22:16 +00:00
Stefan Monnier
32c58c4725 (vc-cvs-revision-completion-table): Make it work when the
arg is a list of files.
2007-10-20 01:07:52 +00:00
Eric S. Raymond
ac3f4c6f02 Terminology cleanup. 2007-10-10 18:52:45 +00:00
Stefan Monnier
72d1ce6153 (vc-cvs-annotate-time): Use inhibit-read-only and inhibit-modification-hooks. 2007-09-15 21:07:32 +00:00
Dan Nicolaescu
eff23ff376 * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
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.
2007-07-30 00:19:06 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Dan Nicolaescu
3a12f9f830 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
for branches and new files.

* vc-hooks.el (vc-default-mode-line-string): Move mouse-face and
local-map handling ...
(vc-mode-line): ... here. Improve handling of help-echo.

* vc.el (mode-line-string): Document help-echo usage.
2007-07-22 19:04:11 +00:00
Stefan Monnier
da4c9778fb (vc-(m)cvs-create-repo): Remove. 2007-07-20 03:56:53 +00:00
Eric S. Raymond
7d8c433264 vc-cvs-checkin had some reference problems, now fixed. 2007-07-19 14:26:08 +00:00
Eric S. Raymond
ea139d51c4 Fix two variable-reference bugs. 2007-07-19 14:18:33 +00:00
Eric S. Raymond
8cdd17b444 Put the lower half (the back-end) of NewVC in place. This commit
makes only the minimum changes needed to get the old vc.el logic
working with the new back ends.
2007-07-18 16:32:40 +00:00
Stefan Monnier
2346acf6ba Require CL.
(vc-cvs-revision-table, vc-cvs-revision-completion-table):
New functions to provide completion of revision names.
2007-07-12 03:13:37 +00:00
Stefan Monnier
98ad325cb3 (vc-functions): Clear up the cache when reloading the file.
(vc-cvs-annotate-first-line-re): New const.
(vc-cvs-annotate-process-filter): New fun.
(vc-cvs-annotate-command): Use them and run the command asynchronously.
2007-07-12 03:10:45 +00:00
Stefan Monnier
f4b43eb362 (vc-cvs-revert): Use vc-default-revert.
(vc-cvs-checkout): Remove last arg now unused; simplify.
2007-07-08 19:34:19 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
André Spiegel
bd25cb265f (vc-cvs-delete-file): Commit the file after removing it. 2005-10-30 11:08:41 +00:00
Thien-Thi Nguyen
0d30b33766 Update years in copyright notice; nfc. 2005-08-06 22:13:43 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
André Spiegel
ce127eaa53 (vc-cvs-checkout-model): Handle the case where FILE doesn't exist. 2005-05-22 10:29:44 +00:00
Werner LEMBERG
aaed846c01 * vc-cvs.el: Replace illegal' with invalid'. 2005-03-25 08:25:16 +00:00
Kim F. Storm
bf247b6ed0 Change release version from 21.4 to 22.1 throughout.
Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
André Spiegel
92bafc3058 (vc-cvs-diff): Don't diff asynchronously if vc-disable-async-diff is
t.
2005-01-09 21:28:53 +00:00
André Spiegel
5124dd38c8 (vc-cvs-state): Handle the case where vc-state is still nil. 2004-11-30 11:02:23 +00:00
Thien-Thi Nguyen
b44a1825e5 (vc-cvs-local-month-numbers): Delete var.
(vc-cvs-annotate-time): Incorporate value of deleted var.
Remove special-case handling of beginning-of-buffer cruft.
Cache ending position (point) and return value in text property
`vc-cvs-annotate-time', and consult it on subsequent invocations.
2004-11-03 14:28:31 +00:00
Thien-Thi Nguyen
bc99a9685c (vc-cvs-annotate-command): Delete extraneous lines from beginning of buffer. 2004-11-03 14:16:14 +00:00
André Spiegel
a9817cc404 (vc-cvs-print-log, vc-cvs-diff): Add optional BUFFER argument. 2004-03-21 15:45:31 +00:00
André Spiegel
f2a2e61bb2 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
function.
2004-01-20 17:41:18 +00:00
Dave Love
f52d10f2b7 (vc-cvs-parse-entry): Revert last change to allow
bootstrap.
2003-10-01 13:23:34 +00:00
André Spiegel
e5d9c9a23d (vc-cvs-parse-entry): Don't require parse-time, because it's
autoloaded now.
2003-09-26 07:23:36 +00:00
André Spiegel
ecfc2ba00d (vc-cvs-parse-entry): Restore the code to compare time stamps
numerically, rather than textually.
2003-09-24 11:55:45 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Stefan Monnier
e54faddb96 (vc-cvs-repository-hostname): New operation.
(vc-cvs-stay-local-p): Use vc-stay-local-p.
(vc-cvs-rename-file): Remove (use the default).
(vc-cvs-register): Register parent dir if needed.
(vc-cvs-could-register): Return non-nil if parent can be registered.
(vc-cvs-state, vc-cvs-dir-state, vc-cvs-print-log, vc-cvs-diff)
(vc-cvs-diff-tree, vc-cvs-make-version-backups-p): Use vc-stay-local-p.
2003-07-04 22:40:26 +00:00
André Spiegel
63274db139 (vc-cvs-checkout): Don't leave the branch when REV is t.
From Don Provan <dprovan@bivio.net>.
2003-05-23 17:57:29 +00:00
Stefan Monnier
a0688443cc (vc-cvs-mode-line-string): Use vc-default-mode-line-string.
(vc-cvs-delete-file, vc-cvs-rename-file): New functions.
2003-05-09 14:32:01 +00:00
Stefan Monnier
f153cb52f8 (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
(vc-cvs-diff-tree, vc-cvs-checkout): Use vc-switches.
(vc-cvs-revert): Undo patch committed 2003-05-08T20:08:12Z!monnier@iro.umontreal.ca.
2003-05-08 20:44:50 +00:00