mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-02 08:22:22 +00:00
Code Issues Releases Activity
80,077 Commits 226 Branches 189 Tags 497 MiB
871f46d31e
Commit Graph

71 Commits

Author SHA1 Message Date
Miles Bader
1bad168e59 Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1006
 2008-01-22 23:53:46 +00:00
Dan Nicolaescu
b5e791bdb7 (vc-svn-registered): Make it work for non-existent 
files.
 2008-01-20 19:56:43 +00:00
Dan Nicolaescu
c222c25fd0 * vc-svn.el (vc-svn-after-dir-status): New function. 
(vc-svn-dir-status): Run svn asynchronously.
 2008-01-19 16:32:23 +00:00
Dan Nicolaescu
f8e89f1963 * vc-svn.el (vc-svn-dir-status): New function. 2008-01-18 23:45:04 +00:00
Dan Nicolaescu
28e4e2b434 * smerge-mode.el (smerge-start-session): Rename from smerge-auto. 
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Rename callers.

* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook): Undo previous change.
 2008-01-16 06:22:59 +00:00
Dan Nicolaescu
54648b5c23 * vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the 
after-save-hook so that it is not called multiple times.

* vc-svn.el (vc-svn-resolve-when-done): Likewise.
 2008-01-15 04:37:20 +00:00
Dan Nicolaescu
ba463d9eca * smerge-mode.el (smerge-auto): New function. 
* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook):
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode.
(top-level): Add a Todo list.
 2008-01-14 07:38:05 +00:00
Dan Nicolaescu
11f6a31de4 (vc-svn-registered): Return the correct value for 
ignored and unregistered files.
 2008-01-10 14:17:06 +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
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Eric S. Raymond
42a0a13593 * vc-svn.el (vc-svn-modify-change comment): New function. 2008-01-02 00:42:37 +00:00
Eric S. Raymond
4f07b9f2ef Remove some debugging code. 2008-01-01 18:40:42 +00:00
Eric S. Raymond
abc61762a5 * vc-svn.el (vc-svn-parse-status): Set the 'unregisted property correctly. 2008-01-01 16:39:59 +00:00
Eric S. Raymond
c59a24425b * vc.el (vc-dired-hook): Speed tuning. Replace a vc-backend call 
with vc-state.
 2008-01-01 11:17:37 +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
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
13b5602562 *** empty log message *** 2007-12-27 03:10:52 +00:00
Eric S. Raymond
cdce374aed *** empty log message *** 2007-12-26 23:24:08 +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
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
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
Eric S. Raymond
ac3f4c6f02 Terminology cleanup. 2007-10-10 18:52:45 +00:00
Eric S. Raymond
f9914e5467 This is the actual fix.... 2007-10-09 16:54:40 +00:00
Miles Bader
1af74d06e5 Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
 2007-10-09 08:52:57 +00:00
Stefan Monnier
1c67a81478 (vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs. 
Used to try and automatically enabled smerge-mode in the presence of
conflicts and to call `svn resolved' when the conflicts are gone.
(vc-svn-parse-status): Remember the svn-specific status.
 2007-09-28 18:45:43 +00:00
Glenn Morris
ad70e472bd Improve previous change. 
(vc-svn-print-log): If there is only one file, use "Working file:" as
the prefix, for the sake of log-view-current-file.
 2007-09-03 06:25:50 +00:00
Glenn Morris
cb3b6f1d3f (vc-svn-print-log): Change the "Working file" prefix back to singular, 
for the sake of log-view.
 2007-09-03 06:19:16 +00:00
Dan Nicolaescu
20f8ac737b (vc-svn-diff-tree): Pass a list to vc-svn-diff. 2007-08-31 14:07:49 +00:00
Glenn Morris
c62a495a84 (vc-svn-diff): If the repository version of all the files is the same 
as the specified OLDVERS, do a local diff.
 2007-08-27 07:04:45 +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
Eric S. Raymond
2b330cb8ae Fix read error reported by Fabien Coelho. 2007-07-18 20:11:28 +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
0b0dad411f (vc-svn-repository-hostname): Adjust to non-XML format of newer .svn/entries. 2007-06-26 16:39:58 +00:00
Stefan Monnier
e4cc3f57aa (vc-svn-program): New var. 
(vc-svn-command): Use it.
 2007-06-11 18:41:09 +00:00
Stefan Monnier
fc2fb30ca6 Remove the code inherited from CVSREAD and `cvs edit'. 
(vc-svn-use-edit): Remove unused config var.
(vc-svn-update, vc-svn-revert): Checkout is always implicit.
 2007-02-19 19:42:10 +00:00
Stefan Monnier
459b1fe4c0 (vc-svn-merge-news): Understand the new format with two 
added columns of chars.  Remove support for the "no-meta-info" format.
Prompted by Romain Francoise <romain@orebokech.com>.
 2007-02-07 23:02:12 +00:00
Stefan Monnier
c45b3be32d (vc-svn-parse-status): Trust the filename argument more 
than the program's output.
 2007-01-14 14:49:28 +00:00
Chong Yidong
ace2fad9da Fix typo in previous commit. 2006-11-09 03:34:17 +00:00
Chong Yidong
4a511c20a0 Undo last fix. 2006-11-09 03:31:09 +00:00
Chong Yidong
9a25258f0f (vc-svn-admin-directory): New var. 
(vc-svn-registered, vc-svn-responsible-p)
(vc-svn-repository-hostname): Use it.
Suggested by arit93@yahoo.com.
 2006-11-09 03:14:51 +00:00
Stefan Monnier
bc8c1bb448 (vc-svn-parse-status): Remove unused arg `localp'. 
Add arg `filename' instead.  Don't set vc-backend if `filename' is set.
Return `filename's status if applicable.  Update callers.
 2006-10-20 07:56:20 +00:00
Stefan Monnier
bf54d81452 (vc-svn-print-log): Show recent commits as well. 2006-02-09 03:47:00 +00:00
Thien-Thi Nguyen
cbbd2cd318 (vc-svn-previous-version, vc-svn-next-version): New funcs. 2006-02-06 15:58:38 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Stefan Monnier
df4da7f46a (vc-svn-registered): Use it to avoid popping up a spurious 
frame in case of errors.
 2005-12-13 22:25:24 +00:00
Bill Wohler
63fc53c944 (vc-svn-registered): Fix problem of visiting non-writable 
Subversion-controlled files by saving window configuration before
calling vc-do-command. vc-do-command calls pop-to-buffer on error
which is unexpected during registration.
 2005-12-13 00:48:04 +00:00
Stefan Monnier
1508b91a6c (vc-svn-registered): Catch all errors. 2005-11-14 04:33:03 +00:00