Commit graph

233 commits

Author SHA1 Message Date
Sam Steingold
dce1354779 revert the `vc-status' keybindings 2008-02-06 19:06:34 +00:00
Sam Steingold
527b313d4d (vc-prefix-map): Bind `vc-status' to "?".
(vc-prefix-key): New user-customizable variable.
(vc-menu-map): Add `vc-status'.
2008-02-06 17:52: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
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Eric S. Raymond
1f0bee0a2d * progmodes/grep.el (grep-find-ignored-directories): Initialize
from the value of vc-directory-exclusion-list.

* vc-hooks (vc-directory-exclusion-list):  Include "_darcs",
even though we don't have a back end for darcs yet.
2008-01-02 23:47:35 +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
9c4b89d5a4 * vc-hooks.el, vc.el: Move vc-directory-exclusion-list from vc.el
to vc-hooks.el so it will be available to other modes, such as
speedbar.el.  Also, teach it to recognize monotine state directories.

* speedbar.el: Remove this mode's fragile assumptions about
version-control systems.  Instead, make it use logic from
vc-hooks.el so it will become smarter whenever VC mode does.

* vc-hooks.el: 'added is a real state, not a future hypothetical
one. Fix the documentation.
2007-12-28 13:29:41 +00:00
Eric S. Raymond
14f2605422 And another typo fix. 2007-12-28 10:00:02 +00:00
Eric S. Raymond
fae001810e Typo fix. 2007-12-28 09:59:34 +00:00
Dan Nicolaescu
004a00f4ae * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
* play/yow.el (doctor-ret-or-read):
* vc-hooks.el (vc-dired-resynch-file):
* vc-hg.el (log-view-get-marked):
* smerge-mode.el (ediff-cleanup-mess):
* pcvs.el (vc-editable-p, vc-checkout):
* pcomplete.el (comint-bol):
* informat.el (texinfo-format-refill):
* ido.el (tramp-tramp-file-p):
* ibuffer.el (ibuffer-mark-on-buffer, ibuffer-format-qualifier)
(ibuffer-generate-filter-groups)
(ibuffer-format-filter-group-data):
* add-log.el (c-beginning-of-defun, c-end-of-defun): Declare as
functions.

* ido.el (ido-file-internal): Move with-no-warnings to include the
ffap-string-at-point call.

* pcomplete.el (pcomplete-executables): Move defsubst before first
use.

* vc-hg.el (vc-hg-revision-table): Fix last change.
2007-11-19 08:50:04 +00:00
Stefan Monnier
6e5d0e9e73 (vc-workfile-version): Compatibility alias.
(vc-default-working-revision): Compatibility for backends.
2007-10-15 19:26:25 +00:00
Eric S. Raymond
0a0ca7f11f Follow through on the VC terminology change (version -> revision). 2007-10-11 16:02:53 +00:00
Eric S. Raymond
44cd688b7b Robustify a bit against filenames with no directory component. 2007-10-11 11:22:19 +00:00
Eric S. Raymond
ac3f4c6f02 Terminology cleanup. 2007-10-10 18:52:45 +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
Dan Nicolaescu
793a22023e * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
* vc-hooks.el (vc-menu-entry): New var.
(vc-mode-line-map): Use it so that this menu also uses the extra-menu.
(menu-bar-tools-menu): Add the VC menu here rather than in menu-bar.el.
(vc-menu-map): Declare and initialize in one step.

* menu-bar.el (vc-menu-map): Don't setup any more.
Instead, just create the proper spot in the menu.

* vc.el: Document new VC operation `extra-menu'.

* vc-hooks.el (vc-default-extra-menu, vc-menu-map-filter): New
function.
2007-09-18 01:28:25 +00:00
Stefan Monnier
b5883dcf11 (vc-handled-backends): Add Mtn. 2007-09-14 16:54:16 +00:00
Stefan Monnier
b1dc6d44c9 Add vc-mtn.el. 2007-09-14 16:33:47 +00:00
Dan Nicolaescu
a549ce7054 * vc-hooks.el (vc-registered): Use mapc instead of mapcar.
(vc-delete-automatic-version-backups): Likewise.

* vc.el (vc-dired-buffers-for-dir): Likewise.
2007-08-26 00:32:23 +00:00
Jason Rumney
4d2f172bd3 (vc-menu-map-filter): Reapply 2007-08-06 bugfix. 2007-08-22 22:40:18 +00:00
Stefan Monnier
98481bad3b (vc-menu-map-filter): Use vc-call and reindent. 2007-08-21 15:10:55 +00:00
Stefan Monnier
e2247dc840 (vc-menu-entry): New var.
(vc-mode-line-map): Use it so that this menu also uses the extra-menu.
(menu-bar-tools-menu): Add the VC menu here rather than in menu-bar.el.
(vc-menu-map): Declare and initialize in one step.
(vc-menu-map-filter): Move&rename from menu-bar.el:menu-bar-vc-filter
2007-08-21 15:07:36 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Stefan Monnier
a377373012 (vc-default-find-file-not-found-hook): Do nothing. 2007-08-09 14:42:00 +00:00
Jason Rumney
daffc81ab9 (vc-call): Add doc string. 2007-08-06 11:03:50 +00:00
Miles Bader
5716cebdd0 Change capitalization of VC backend names for new backends
Revision: emacs@sv.gnu.org/emacs--rel--22--patch-87
2007-08-03 05:09:21 +00:00
Miles Bader
4211679b08 Change capitalization of VC backend names for new backends
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-842
2007-08-03 04:57:05 +00:00
Dan Nicolaescu
cb223bba1d * vc.el: Document new VC operation `extra-menu'.
* vc-hooks.el (vc-default-extra-menu): New function.

* menu-bar.el (menu-bar-vc-filter): New function.
(menu-bar-tools-menu): Use it as a filter.
2007-08-01 17:13:45 +00:00
Stefan Monnier
5b5485e6fd (vc-find-file-hook): Failsafe if the backend's `registered' function burps. 2007-07-31 15:28:16 +00:00
Stefan Monnier
a0e5e0759c * vc-bzr.el: New file (copied from the trunk).
* vc-hooks.el (vc-handled-backends): Add BZR.
2007-07-31 15:26:05 +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
Dan Nicolaescu
625f71cff9 * vc-git.el: Relicense to GPLv3 or later.
(vc-directory-exclusion-list, vc-handled-backends): Remove.

* vc-hooks.el (vc-handled-backends): Add GIT.

* vc.el (vc-directory-exclusion-list): Add .git.

* vc2-xtra.texi (Customizing VC): Add GIT.
2007-07-26 18:44:39 +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
Stefan Monnier
5719a0989e (vc-mode-line-map): New const.
(vc-mode-line): Use it.
2007-07-23 21:07:03 +00:00
Thien-Thi Nguyen
33e0847dbb (vc-stay-local-p): Fix bug: Avoid remove-if-not.
Also, if FILE is a list, return non-nil if any of its
elements should stay local.  Update docstring.
2007-07-23 19:46:00 +00:00
Stefan Monnier
4127ed49c3 (vc-find-root): Walk up the tree to find an existing
`file' from which to start the search and fix case where `file' is the
current directory and the root as well.
2007-07-23 05:38:44 +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
3b27900d2a (vc-find-root): Fix case where `file' is the current
directory and the root as well.
2007-07-20 03:48:27 +00:00
Dan Nicolaescu
c0edfa75c4 * vc-hooks.el (vc-default-workfile-unchanged-p): Pass a list
instead of a file.

* vc-hg.el (vc-hg-print-log): Fix for multiple files.

* vc.el: (vc-directory-exclusion-list): Add .hg and .bzr.
(vc-diff-internal): Pass a list instead of a file.
2007-07-20 01:22:18 +00:00
Stefan Monnier
66752bb47d (vc-find-root): Walk up the tree to find an existing
`file' from which to start the search.
2007-07-19 18:49:59 +00:00
Eric S. Raymond
e4d2689288 Generalize stay-local-p to operatre on lists of files.
Change two keybindings to point to new function names.
2007-07-18 12:43:37 +00:00
Dan Nicolaescu
dbd3d78766 (vc-handled-backends): Move BZR later in the list. 2007-07-16 04:25:51 +00:00
Stefan Monnier
e5162bc170 Remove spurious * in docstrings.
(vc-handled-backends): Add BZR.
2007-07-13 04:49:30 +00:00
Stefan Monnier
fc8b8d0fb5 (vc-find-file-hook): Use with-demoted-errors. 2007-07-13 04:46:37 +00:00
Dan Nicolaescu
82c4728d3b * vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
mouse binding and a tooltip.
* menu-bar.el (vc-menu-map): New defalias.
2007-07-11 18:37:38 +00:00
Dan Nicolaescu
c2ba4a6b0a * vc-hooks.el (vc-handled-backends): Add HG.
* vc-hg.el (vc-handled-backends): Remove, done in vc-hooks.el now.
2007-07-05 19:48:06 +00:00
Miles Bader
fdabbcb537 lisp/vc-hooks.el (vc-find-root): Fix file attribute test
Revision: emacs@sv.gnu.org/emacs--rel--22--patch-27
2007-05-25 04:41:42 +00:00
Glenn Morris
6e94b3b6d8 Sync change from trunk at request of rms in FOR-RELEASE:
Stefan Monnier  <monnier at iro.umontreal.ca>

(vc-find-root): Stop searching when the user changes.
2007-05-17 07:38:11 +00:00