mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-17 17:58:46 +00:00
Code Issues Releases Activity
87,606 Commits 228 Branches 190 Tags 651 MiB
453b38f050
Commit Graph

287 Commits

Author SHA1 Message Date
Stefan Monnier
066b7259c2 (vc-follow-link): Complete last change. 2008-11-23 05:10:53 +00:00
Stefan Monnier
33f95a82e9 (vc-follow-link, vc-find-file-hook): 
Use buffer-file-truename to handle symlinks in any part of the filename.
 2008-11-22 05:23:42 +00:00
Glenn Morris
37af967deb (vc-find-root): Remove bogus alias. 2008-10-29 02:55:04 +00:00
Martin Rudalics
37e14a62f5 (vc-stay-local): Fix typo in choice. 2008-10-28 18:52:02 +00:00
Stefan Monnier
8cd56959b4 * files.el (locate-dominating-stop-dir-regexp): New var. 
(locate-dominating-file): Change arg from a regexp to a file name.
Rewrite using the vc-find-root code to avoid directory-files which is
too slow.  Obey locate-dominating-stop-dir-regexp.
Don't pay attention to changes in owner.
(project-find-settings-file): Adjust call to locate-dominating-file.

* progmodes/flymake.el (flymake-find-buildfile):
Adjust call to locate-dominating-file.

* vc-hooks.el (vc-find-root): Use locate-dominating-file.
(vc-ignore-dir-regexp): Use locate-dominating-stop-dir-regexp.
 2008-10-25 15:18:53 +00:00
Dan Nicolaescu
5870cb7682 * vc-hooks.el (vc-stay-local): Add a new choice and default to it. 
* vc-cvs.el (vc-cvs-dir-stay-local): Remove.
(vc-cvs-stay-local): Add a new choice and default to it.
(vc-cvs-dir-status): Use the new vc-stay-local choice.

* vc-svn.el (vc-svn-dir-status): Use the new vc-stay-local choice.
 2008-10-13 01:16:49 +00:00
Michael Albinus
f98c9a2379 * vc-hooks.el (vc-file-clearprops): Revert change from 2008-09-29. 
(vc-file-not-found-hook): Check, that `buffer-file-name' is
non-nil.  It is not clear, whether this is only fixing symptoms on
an error. OTOH, in all other cases, the call of `vc-file-clearprops'
is embedded by that check.  So it might be TRT.  Suggested by Dan
Nicolaescu <dann@ics.uci.edu>.
 2008-09-30 19:11:07 +00:00
Michael Albinus
613658d4b2 * vc-hooks.el (vc-file-clearprops): Check, that FILE is a string. 2008-09-29 18:58:08 +00:00
Stefan Monnier
3dd2acc9d3 * vc-svn.el (vc-svn-root): 
* vc-sccs.el (vc-sccs-root):
* vc-rcs.el (vc-rcs-root):
* vc-cvs.el (vc-cvs-root): Delete.
* vc-hooks.el (vc-find-root): Remove `invert' argument.
 2008-09-07 20:24:24 +00:00
Glenn Morris
5495ef4e97 (vc-previous-version): Move alias to vc.el. 2008-09-01 21:45:32 +00:00
Chong Yidong
70c8a3903f (vc-workfile-unchanged-p): Revert last change. 2008-08-28 17:48:15 +00:00
Chong Yidong
5d3351276e (vc-workfile-unchanged-p): If the checkout time is not the same as the 
last modification time, fall back on the backend-specific check.
 2008-08-27 20:39:33 +00:00
Dan Nicolaescu
ea5ebb5907 Remove obsolete comment. 2008-07-22 02:51:59 +00:00
Dan Nicolaescu
74d0991fc5 * vc.el: 
* vc-hooks.el:
* vc-dispatcher.el: Move vc-dir variables and functions ...
* vc-dir.el: ... here.  New file.
* Makefile.in (ELCFILES): Add vc-dir.elc.
 2008-06-22 19:04:22 +00:00
Dan Nicolaescu
e02d8ae787 * vc-dispatcher.el (vc-directory-resynch-file): Rename to ... 
(vc-dir-resynch-file): ... this.  Update callers.
Use vc-string-prefix-p.  Ignore directory args.
(vc-string-prefix-p): CSE.
(vc-resynch-buffer): Restore conditional.

* vc-hooks.el (vc-after-save): Improve test.
(vc-mode-line): Fix indentation.
 2008-05-27 05:36:03 +00:00
Eric S. Raymond
370fded4f6 Snapshot primitives globally renamed to refer to tags, documentation updated. 2008-05-15 17:38:50 +00:00
Glenn Morris
7264c6b802 (vc-directory-resynch-file): Fix declaration. 2008-05-15 03:32:23 +00:00
Eric S. Raymond
a970a27e03 Remove dead code. 2008-05-11 18:15:59 +00:00
Dan Nicolaescu
0108dbd656 (vc-prefix-map): Remove duplicate binding. 2008-05-10 03:55:00 +00:00
Eric S. Raymond
79ac8f50ea VC directory bindings are noew documented. 2008-05-09 20:07:01 +00:00
Stefan Monnier
a749e19d07 * vc.el (vc-mark-resolved): Add `backend' argument. 
(vc-next-action): Pass it the backend.
(vc-next-action, vc-checkout, vc-mark-resolved, vc-version-diff)
(vc-merge, vc-rollback, vc-update, vc-transfer-file, vc-delete-file)
(vc-default-comment-history, vc-default-create-snapshot)
(vc-default-retrieve-snapshot, vc-default-revert, vc-annotate)
(vc-annotate-revision-previous-to-line)
(vc-annotate-show-diff-revision-at-line, vc-annotate-warp-revision):
* vc-svn.el (vc-svn-checkout):
* vc-mcvs.el (vc-mcvs-checkout):
* vc-hooks.el (vc-state, vc-default-workfile-unchanged-p)
(vc-working-revision, vc-before-save, vc-mode-line):
Prefer vc-call-backend to vc-call so as not to recompute the backend.
 2008-05-09 16:41:26 +00:00
Glenn Morris
7d56ad0dd1 Fix comment typo in previous. 2008-05-08 05:40:55 +00:00
Eric S. Raymond
db86064f73 Meta-CVS support removed. 2008-05-07 22:11:08 +00:00
Eric S. Raymond
4903369afe Remove VC-Dired and backend dir-state methods. 2008-05-07 21:27:41 +00:00
Eric S. Raymond
e6244c1bcd Cleanup preparatory to getting rid of dired. 2008-05-06 23:56:49 +00:00
Eric S. Raymond
c8d4f1a0a6 More decoupling of vc-dispatcher.el from vc.el. 2008-05-06 16:00:54 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Eric S. Raymond
70e2f6c752 Clean up vc*-revision-granularity and vc*-checkout-model. 2008-05-02 17:47:25 +00:00
Juanma Barranquero
d4e772c4c2 (vc-call, vc-state): Fix typos in docstrings. 
(vc-default-state-heuristic): Doc fix.
 2008-05-02 09:19:29 +00:00
Eric S. Raymond
6cdc3bc9f1 More preparation for removing dired. 2008-05-02 07:47:18 +00:00
Eric S. Raymond
25e94278c3 The day wehen vc-toggle-ready-only was a good idea is long gone. 2008-05-02 07:12: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
b54462764d * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision) 
(vc-check-master-templates, vc-file-not-found-hook)
(vc-kill-buffer-hook):
* vc.el (vc-process-sentinel, vc-exec-after, vc-do-command)
(vc-find-position-by-context, vc-buffer-context)
(vc-restore-buffer-context, vc-responsible-backend)
(vc-expand-dirs, vc-ensure-vc-buffer, vc-buffer-sync)
(vc-next-action, vc-register, vc-register-with, vc-steal-lock)
(vc-finish-logentry, vc-coding-system-for-diff, vc-switches)
(vc-version-diff, vc-diff, vc-insert-headers)
(vc-dired-buffers-for-dir, vc-dired-resynch-file)
(vc-snapshot-precondition, vc-create-snapshot, vc-print-log)
(vc-revert, vc-rollback, vc-version-backup-file)
(vc-rename-master, vc-delete-file, vc-rename-file)
(vc-branch-part, vc-default-retrieve-snapshot)
(vc-annotate-display-autoscale, vc-annotate-display-select)
(vc-annotate, vc-annotate-warp-revision, vc-annotate-difference)
(vc-annotate-lines, vc-file-tree-walk-internal): Use when instead of if.
(vc-dir-update): Handle directories.
(vc-default-status-printer): Simplify.
 2008-04-21 05:11:56 +00:00
Stefan Monnier
14b114019e * lisp/vc-sccs.el (vc-sccs-do-command): New fun. Use the "sccs" command. 
(vc-sccs-register, vc-sccs-checkin, vc-sccs-find-revision)
(vc-sccs-checkout, vc-sccs-rollback, vc-sccs-revert)
(vc-sccs-steal-lock, vc-sccs-modify-change-comment)
(vc-sccs-print-log): Use it.
* lisp/vc-hooks.el (vc-path): Remove SCCS-specific hack.
* lib-src/vcdiff: Use "sccs get" rather than "get"; leave PATH alone.
 2008-04-19 21:53:55 +00:00
Juanma Barranquero
329a656ebd (vc-ignore-vc-files, vc-master-templates, vc-header-alist): 
Add WHEN to obsolescence declaration.
(vc-state): Fix typo in docstring.
 2008-04-18 10:01:07 +00:00
Stefan Monnier
e1aec6fbf1 Rename vc-status to vc-dir and the vc-status var to vc-ewoc. 2008-04-16 00:57:12 +00:00
Dan Nicolaescu
7fbb47976e * vc-hooks.el (vc-state): Add new state `conflict'. 
(vc-after-save): Use when not if.
(vc-default-mode-line-string): Deal with the conflict state.
(vc-prefix-map):
(vc-menu-map): Bind vc-status instead of vc-directory.

* vc.el (vc-editable-p):
(vc-default-status-printer):
(vc-next-action): Deal with the conflict state.
(vc-mark-resolved): New function.
(vc-status-mode): Fix mode name.
(vc-default-comment-history): Use when not if.
(Todo): Add new entries, remove old ones.

* vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state.
(vc-cvs-parse-status):
(vc-cvs-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
Detect the conflict state.
 2008-04-10 07:32:25 +00:00
Stefan Monnier
5bad314022 (vc-default-mode-line-string): Use ? for missing. 2008-04-09 20:23:11 +00:00
Glenn Morris
aafb0703bf (vc-responsible-backend): Declare as function. 2008-04-01 02:58:32 +00:00
Dan Nicolaescu
f3d57a2c20 (vc-menu-map-filter): Be more careful when finding 
the current backend.
 2008-03-29 05:33:06 +00:00
Stefan Monnier
f42af25505 (vc-before-save): Be careful not to prevent saving the file. 2008-03-27 15:00:32 +00:00
Dan Nicolaescu
a58b57e22c (vc-default-mode-line-string): Deal with 'removed 
and 'missing files.
 2008-03-26 04:46:42 +00:00
Dan Nicolaescu
dd0d723c8e (vc-state): Add documentation for 'missing. 2008-03-25 15:47:02 +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
9b7b3814df * vc.el (vc-status-crt-marked): New variable. 
(vc-status-mode): Make it local.
(vc-status-refresh): Use it to save the marked files.
(vc-update-vc-status-buffer): Use it to restore the marked files.

* vc-svn.el (vc-svn-after-dir-status):
* vc-hg.el (vc-hg-after-dir-status): Clean up the temporary buffer.
 2008-02-29 19:13:54 +00:00
Miles Bader
b03f96dc5a Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1074
 2008-02-24 10:09:07 +00:00
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
Thien-Thi Nguyen
6dbb5c761e Kill eol whitespace; nfc. 2008-02-19 11:18:56 +00:00
Stefan Monnier
5f8ea2c89b (vc-find-root): Remove initial loop because it's not 
careful enough.  Detect the uid-change all within the main loop.
 2008-02-16 21:38:24 +00:00