1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-22 13:40:44 -08:00
Commit graph

740 commits

Author SHA1 Message Date
Dan Nicolaescu
f3ff0fe9ac (vc-annotate-find-revision-at-line): New function.
(vc-annotate-mode-map): Bind it.
(vc-annotate-mode-menu): Add a menu entry for it.  Add :help for
some entries.
2008-02-14 07:37:51 +00:00
Thien-Thi Nguyen
1d5b214902 Make vc-diff-internal messages consistent across many cases.
(vc-exec-after): Append CODE to previous fragments.
(vc-diff-finish): Take BUFFER directly, not BUFFER-NAME;
take MESSAGES instead of VERBOSE; use it when non-nil.
(vc-diff-internal): Compute messages once; use them;
update call to vc-diff-finish.
2008-02-09 12:32:57 +00:00
Thien-Thi Nguyen
cea93de37d (vc-update): Fix bug: Specify branch tip as vc-checkout REVISION. 2008-02-01 05:52:21 +00:00
Dan Nicolaescu
3f08440f1d Add TODO item about not defaulting to RCS. 2008-01-27 16:31:09 +00:00
Thien-Thi Nguyen
832ffa7c8e (vc-exec-after): For mode-line-process highlighting, if feature
`compile' is not available, fall back to font-lock-warning-face.
2008-01-26 20:04:49 +00:00
Michael Albinus
65b014077a * vc.el (vc-directory, vc-update-change-log): Remove check for
Tramp.  Both functions work for it, though pretty slow
(`vc-directory').  Maybe the implementation can be optimized.
2008-01-26 14:53:55 +00:00
Thien-Thi Nguyen
845ec007da (vc-diff-finish): Search all frames for the buffer's window. 2008-01-24 15:09:24 +00:00
Thien-Thi Nguyen
d36122a23e (vc-next-action): Fix two instances of "free-var file" bug:
In both cases, convert single call to one wrapped in dolist.
2008-01-24 13:09:13 +00:00
Thien-Thi Nguyen
fddde1f0b5 Handle dead buffers in async filters/sentinels.
(vc-process-filter): Do nothing if buffer not live.
(vc-diff-finish): Rename from vc-diff-sentinel.
No longer take REV1-NAME and REV2-NAME.
Instead, take BUFFER-NAME.  Do nothing if buffer not live.
Don't do window resize if no window displays buffer.
(vc-diff-internal): Use vc-diff-finish.
2008-01-24 08:54:00 +00:00
Thien-Thi Nguyen
2ee455eaa3 Delete eol whitespace; nfc. 2008-01-24 08:48:42 +00:00
Dan Nicolaescu
4ac7bfcf33 Add a TODO item about missing files.
(vc-exec-after): Add a tooltip to the new mode-line item.
2008-01-24 08:01:54 +00:00
Dan Nicolaescu
3b3cb33695 Add TODO items. 2008-01-23 16:35:18 +00:00
Glenn Morris
f52749ed49 (vc-diff-sentinel): Do not write a footer if there were differences. 2008-01-22 06:39:44 +00:00
Thien-Thi Nguyen
b49fd377e8 (vc-process-sentinel): After calling the
previous sentinel, do nothing if the process' buffer is not live.
2008-01-21 14:03:09 +00:00
Thien-Thi Nguyen
3c2e52cde9 (vc-process-sentinel): Fix bug introduced in last change:
Set mode-line-process with P's buffer made temporarily current.
2008-01-20 20:29:47 +00:00
Thien-Thi Nguyen
d048f3bf74 (vc-process-sentinel): Set mode-line-process.
(vc-exec-after): Likewise, for the `run' process status.
2008-01-20 20:23:04 +00:00
Dan Nicolaescu
5ab612e823 * vc.el: Make vc-status asynchronous.
(vc-update-vc-status-buffer): New function broken out of ...
(vc-status-refresh): ... here. Pass vc-update-vc-status-buffer to
the dir-status backend function.

* vc-hg.el (vc-hg-dir-status): Compute the status asynchronously.
Move the output processing to ...
(vc-hg-after-dir-status): ... here.  Call the function passed as
an argument with the results.
2008-01-18 23:32:58 +00:00
Dan Nicolaescu
e166638d11 Add a TODO note about vc-state.
(vc-next-action): Register 'unregistered and 'ignored files.  Use
when and unless instead of if where appropriate.
(vc-start-entry): Fix typo.
(vc-status): Autoload it.
2008-01-18 14:12:44 +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
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
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
Dan Nicolaescu
b6fe5b19b1 * vc.el (vc-status-unmark-all-files): New function.
(vc-status-unmark-all-files): Likewise.
(vc-status-mode-map): Add bindings.
2008-01-10 07:51:25 +00:00
Dan Nicolaescu
e11c1d937f (vc-deduce-fileset): Return the currently selected file if
no files are selected when using vc-status.
2008-01-09 07:21:08 +00:00
Dan Nicolaescu
ca8dfeda7c * vc.el (vc-status-headers): Rename from
vc-status-insert-headers.  Just return header.
(vc-status-move-to-goal-column): New function.
(vc-status-mode-map): Define more keys.
(vc-status-mode): Use vc-status-refresh.  Now 'special.
(vc-status-refresh): New function.
(vc-status-next-line): Likewise.
(vc-status-previous-line): Likewise.
(vc-status-mark-file): Use vc-status-next-line.
(vc-status-unmark-file): Use vc-status-previous-line.
(vc-status-unmark-file-up): New function.
(vc-status-register): Likewise.
(vc-status-find-file): Likewise.
(vc-status-find-file-other-window): Likewise.
(vc-status-current-file): Likewise.
(vc-ensure-vc-buffer): Understand vc-status mode.
2008-01-09 05:19:04 +00:00
Stefan Monnier
cc72026bca (vc-ensure-vc-buffer): Check liveness of vc-parent-buffer. 2008-01-06 16:02:38 +00:00
Dan Nicolaescu
8fcaf22f90 * vc.el (vc-status-fileinfo): New defstruct.
(vc-status): New defvar
(vc-status-insert-headers, vc-status-printer, vc-status)
(vc-status-mode-map, vc-status-mode, vc-status-mark-file)
(vc-status-unmark-file, vc-status-marked-files): New functions.

* vc-hg.el (vc-hg-dir-status): New function.
2008-01-06 10:20:26 +00:00
Juanma Barranquero
df49d02eba Fix typo in comment. Reported by Tom Tromey <tromey@redhat.com>. 2008-01-06 03:18:08 +00:00
Stefan Monnier
f605fc58e2 (vc-process-sentinel): Fix apparent typo.
(vc-do-command): Forcefully kill any left over process.
Use start-file-process.
(vc-annotate-get-time-set-line-props): Check we don't move backward.
2008-01-05 05:25:13 +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
Dan Nicolaescu
55adbcc236 State that dir-state is required to set the vc-state and
vc-backend properties.
2007-12-31 19:14:24 +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
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
9580f1fd71 * vc.el (vc-dired-hook): Show unregistered file status as "?" in
non-terse mode.
(vc-dired-ignorable-p): Ignore Makefile when it has a peer named
Makefile.in or Makefile.am
2007-12-27 16:17:17 +00:00
Eric S. Raymond
ba0f59050f Refactoring step. 2007-12-27 15:26:02 +00:00
Eric S. Raymond
35d33ce769 * vc.el (vc-dired-ignorable-p, vc-dired-hook): Speed optimization;
use completion-ignored-extensions to detect files that should be
ignorted in VC-Dired listings, heading off lots of expensive calls
to (vc-state).
2007-12-27 14:41:44 +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
cdce374aed *** empty log message *** 2007-12-26 23:24:08 +00:00
Martin Rudalics
772111be13 (vc-ensure-vc-buffer): Avoid infinite looping when
vc-parent-buffer is the current buffer.
2007-12-19 09:25:18 +00:00
Eric S. Raymond
5f01100afe bname needs to be a buffer name, not a filename. 2007-12-18 08:25:34 +00:00
Deepak Goel
1f325d92d3 Fix vc.el breakage. 2007-12-06 19:56:41 +00:00
Deepak Goel
1388485d6b Fix my previous breakages; improve ChangeLog 2007-12-06 19:48:30 +00:00
Deepak Goel
8c16bd8c35 Fix buggy calls to `error'. 2007-12-06 17:56:42 +00:00
Dan Nicolaescu
93a142e14f * log-edit.el (log-edit-show-diff): New function.
(log-edit-mode-map, log-edit-menu): Bind it.
(log-edit-diff-function): New variable.
(log-edit): Change the 3rd param to be an alist and accept a
function that computes a diff for the files involved.

* vc.el (vc-log-edit): Add a diff function parameter to log-edit.
2007-12-01 19:37:20 +00:00
Dan Nicolaescu
73e72da43b * progmodes/cperl-mode.el (compilation-error-regexp-alist): Pacify
byte compiler.
(cperl-mode): Use with-no-warnings for setting vc-header-alist.

* progmodes/idlwave.el (idlwave-shell-get-path-info)
(idlwave-shell-temp-file, idlwave-shell-is-running)
(widget-value, comint-dynamic-complete-filename, Info-goto-node):
* progmodes/idlw-help.el (idlwave-prepare-structure-tag-completion)
(idlwave-all-method-classes, idlwave-all-method-keyword-classes)
(idlwave-beginning-of-statement, idlwave-best-rinfo-assoc)
(idlwave-class-found-in, idlwave-class-or-superclass-with-tag)
(idlwave-completing-read, idlwave-current-routine)
(idlwave-downcase-safe, idlwave-entry-find-keyword)
(idlwave-expand-keyword, idlwave-find-class-definition)
(idlwave-find-inherited-class, idlwave-find-struct-tag)
(idlwave-get-buffer-visiting, idlwave-in-quote)
(idlwave-make-full-name, idlwave-members-only)
(idlwave-popup-select, idlwave-routine-source-file)
(idlwave-routines, idlwave-sintern-class)
(idlwave-sintern-keyword, idlwave-sintern-method)
(idlwave-sintern-routine-or-method)
(idlwave-substitute-link-target, idlwave-sys-dir)
(idlwave-this-word, idlwave-what-module-find-class)
(idlwave-where):
* progmodes/idlw-complete-structtag.el (idlwave-shell-buffer):
* mail/uce.el (rmail-msg-is-pruned)
(rmail-maybe-set-message-counters, rmail-msgbeg, rmail-msgend)
(rmail-toggle-header):
* mail/sendmail.el (dired-view-file, dired-get-filename):
* mail/rmailkwd.el (rmail-maybe-set-message-counters)
(rmail-display-labels, rmail-msgbeg)
(rmail-set-message-deleted-p, rmail-message-labels-p)
(rmail-show-message, mail-comma-list-regexp)
(mail-parse-comma-list):
* mail/rmail.el (rmail-spam-filter, rmail-summary-goto-msg)
(rmail-summary-mark-undeleted, rmail-summary-mark-deleted)
(rfc822-addresses, mail-abbrev-make-syntax-table)
(mail-sendmail-delimit-header, mail-header-end):
* mail/hashcash.el (message-narrow-to-headers-or-head)
(message-fetch-field, message-goto-eoh)
(message-narrow-to-headers):
* vc.el (view-mode-exit): Declare as functions.

* mail/vms-pmail.el:
* vmsproc.el:
* vms-patch.el: Don't byte compile these files, they don't work.

* Makefile.in (SOME_MACHINE_LISP): Remove VMS files, they are not
compiled anymore.
2007-11-27 06:57:07 +00:00
Thien-Thi Nguyen
5731a8e006 (vc-annotate-mode): Frob buffer invisibility spec.
(vc-annotate-toggle-annotation-visibility): New command.
(vc-annotate-mode-map): Bind "V" to it.
(vc-annotate-mode-menu): Add entry for it.
(vc-annotate-get-time-set-line-props): New func.
(vc-annotate-display-autoscale)
(vc-annotate-display-difference): Use it.
2007-11-24 16:20:10 +00:00
Thien-Thi Nguyen
83f1f73ba6 Delete eol whitespace; nfc. 2007-11-24 16:13:38 +00:00
Dan Nicolaescu
d24182bbae (vc-deduce-fileset): Also look for a fileset in the parent
buffer if the parent buffer is in vc-dired-mode.
2007-11-23 15:17:25 +00:00
Dan Nicolaescu
48b4313069 (vc-find-revision): Set the parent buffer.
Use when instead of if.
2007-11-20 08:15:00 +00:00